1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Commit Graph

16524 Commits

Author SHA1 Message Date
Mans Rullgard
3f5d6a665a binkvideo: simplify and remove invalid shifts
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-14 15:35:29 +00:00
Sebastien Zwickert
ac3dbb4d58 hwaccel: OS X Video Decoder Acceleration (VDA) support.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-11-14 16:07:32 +01:00
KO Myung-Hun
ad0bdd2fd2 lavc: add supports of OS/2 threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 17:33:09 +01:00
Carl Eugen Hoyos
9117592549 Cosmetics: Increase readability. 2011-11-13 15:43:09 +01:00
Carl Eugen Hoyos
eb664d4ae3 Increase Westwood Studios VQA palette dynamics. 2011-11-13 15:12:43 +01:00
Carl Eugen Hoyos
1fc573dd25 Increase Sierra VMD palette dynamics. 2011-11-13 15:04:29 +01:00
Carl Eugen Hoyos
a95906af57 Increase Pictor/PC Paint palette dynamics. 2011-11-13 14:52:21 +01:00
Carl Eugen Hoyos
105cf82acb Increase FLI/FLC Animation palette dynamics for some samples. 2011-11-13 14:50:01 +01:00
Carl Eugen Hoyos
2b656844f8 Increase eXtended BINary text palette dynamics. 2011-11-13 14:42:22 +01:00
Carl Eugen Hoyos
942e9be5d7 Increase Bethesda VID palette dynamics. 2011-11-13 14:40:32 +01:00
Carl Eugen Hoyos
7ea77a6197 Set some Pictor/PC Paint palettes opaque. 2011-11-13 03:08:25 +01:00
Carl Eugen Hoyos
0d49dd3725 Set more KMVC palettes opaque. 2011-11-13 03:01:30 +01:00
Carl Eugen Hoyos
789da2e9f1 Set second Delphine Software International CIN palette opaque. 2011-11-13 02:47:47 +01:00
Michael Niedermayer
545ec935a4 h264: Use mismatching frame numbers in fields to synchronize the
first/second field state independant of them being reference or not.
Fixes Ticket354

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 01:27:18 +01:00
Dominique Leuenberger
8a25d0a860 Trivial: j2kenc: fix compiler warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 21:00:12 +01:00
Carl Eugen Hoyos
3230c756f8 Increase Bitmap Brothers JV palette dynamics.
Approved-by: Peter Ross
2011-11-12 20:56:07 +01:00
Carl Eugen Hoyos
9780c33eca Increase Psygnosis YOP palette dynamics. 2011-11-12 20:49:53 +01:00
Carl Eugen Hoyos
ac0042f55f Set Psygnosis YOP palette opaque. 2011-11-12 20:48:39 +01:00
Carl Eugen Hoyos
0e8da94c2f Increase AVS palette dynamics. 2011-11-12 20:47:33 +01:00
Carl Eugen Hoyos
7b40f46fe2 Set AVS palette opaque. 2011-11-12 20:46:58 +01:00
Carl Eugen Hoyos
1d38c746fd Set Westwood Studios VQA palette opaque. 2011-11-12 20:23:34 +01:00
Carl Eugen Hoyos
90f75f9804 Set Sierra VMD palette opaque. 2011-11-12 20:22:01 +01:00
Carl Eugen Hoyos
e9a2ffa117 Set Beam Software VB palette opaque. 2011-11-12 20:21:07 +01:00
Carl Eugen Hoyos
3b5733bcf9 Set TIFF default grascale palette opaque. 2011-11-12 20:19:51 +01:00
Carl Eugen Hoyos
fd09cd08c0 Set Tiertex Limited SEQ palette opaque. 2011-11-12 20:19:07 +01:00
Carl Eugen Hoyos
58c3538839 Set Sun Rasterfile palette opaque. 2011-11-12 20:17:56 +01:00
Carl Eugen Hoyos
7cd906c179 Set Smacker palette opaque. 2011-11-12 20:16:43 +01:00
Carl Eugen Hoyos
c99cd3e2e2 Set RL2 palette opaque. 2011-11-12 20:15:56 +01:00
Carl Eugen Hoyos
9f9a1f424e Set QuickDraw palette opaque. 2011-11-12 20:15:21 +01:00
Carl Eugen Hoyos
3bf54ab565 Set American Laser Games MM palette opaque. 2011-11-12 20:13:58 +01:00
Carl Eugen Hoyos
64176bc1a3 Set KMVC palette opaque. 2011-11-12 20:13:14 +01:00
Carl Eugen Hoyos
4e8078e6a8 Set FLI/FLC Animation palette opaque. 2011-11-12 20:09:56 +01:00
Carl Eugen Hoyos
c0be4ea0f2 Set Electronic Arts TGV palette opaque. 2011-11-12 20:08:56 +01:00
Carl Eugen Hoyos
f628134e77 Set Electronic Arts CMV palette opaque. 2011-11-12 20:08:23 +01:00
Carl Eugen Hoyos
1567243e8f Set ScummVM DXA palette opaque. 2011-11-12 20:07:31 +01:00
Carl Eugen Hoyos
dcbd18c615 Set Delphine Software International CIN palette opaque. 2011-11-12 20:06:35 +01:00
Carl Eugen Hoyos
e18f70c2d1 Set Chronomaster DFA palette opaque. 2011-11-12 20:05:35 +01:00
Carl Eugen Hoyos
320f0f04a1 Fix Chronomaster DFA palette.
The palette had a blue cast.
2011-11-12 20:03:44 +01:00
Carl Eugen Hoyos
973f3d3e0e Set CD Graphics palette opaque. 2011-11-12 20:01:50 +01:00
Carl Eugen Hoyos
5be097c703 Set Interplay C93 palette opaque. 2011-11-12 20:01:05 +01:00
Carl Eugen Hoyos
d6e14e24b0 Set Discworld II BMV palette opaque. 2011-11-12 19:37:24 +01:00
Carl Eugen Hoyos
3fd9f08971 Set BFI palette opaque. 2011-11-12 19:36:23 +01:00
Carl Eugen Hoyos
f98722443f Set Bethesda VID palette opaque. 2011-11-12 19:34:07 +01:00
Carl Eugen Hoyos
0c5fd6372e Do not try to read 16bit gray png files with alpha channel.
FFmpeg does not support gray16a.
Fixes the crash in ticket #644.
2011-11-12 19:30:27 +01:00
Peter Ross
070d2d7589 jvdec: set alpha component
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 04:26:37 +01:00
Peter Ross
341d4903a6 set ff_cga_palette and ff_ega_palette alpha component
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 04:26:37 +01:00
Michael Niedermayer
ef97d59fb3 vble: remove flags copy, its not used in any speed relevant code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 03:12:13 +01:00
Michael Niedermayer
2fea60c600 vble: remove len array, its unneeded
also remove unneeded memset()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 03:11:22 +01:00
Michael Niedermayer
177bcc1ad9 vble: remove unused variable len.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 03:08:49 +01:00
Michael Niedermayer
dde0af2df1 vble: move get_bits_left() check out of inner loop, we can perform the check completely before the loop.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 03:08:38 +01:00
Michael Niedermayer
e3618cd4a8 vble: remove vble_read_reverse_unary(), the code is a bit simpler this way
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 03:06:57 +01:00
Michael Niedermayer
35fd7b2968 vble: use LUT for vble_read_reverse_unary()
slightly faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 03:02:49 +01:00
Michael Niedermayer
c5e55e214c vble: change variable to int, its slightly faster and int is preferable if no specific size is needed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 03:01:05 +01:00
Michael Niedermayer
29582df797 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vble: remove vble_error_close
  VBLE Decoder
  tta: use an integer instead of a pointer to iterate output samples
  shorten: do not modify samples pointer when interleaving
  mpc7: only support stereo input.
  dpcm: do not try to decode empty packets
  dpcm: remove unneeded buf_size==0 check.
  twinvq: add SSE/AVX optimized sum/difference stereo interleaving
  vqf/twinvq: pass vqf COMM chunk info in extradata
  vqf: do not set bits_per_coded_sample for TwinVQ.
  twinvq: check for allocation failure in init_mdct_win()
  swscale: add padding to conversion buffer.
  rtpdec: Simplify finalize_packet
  http: Handle proxy authentication
  http: Print an error message for Authorization Required, too
  AVOptions: don't return an invalid option when option list is empty
  AIFF: add 'twos' FourCC for the mux/demuxer (big endian PCM audio)

Conflicts:
	libavcodec/avcodec.h
	libavcodec/tta.c
	libavcodec/vble.c
	libavcodec/version.h
	libavutil/opt.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 02:50:25 +01:00
Janne Grunau
6761b6b825 vble: remove vble_error_close
It does not make much sense to factor the error handling to its own
av_always_inline function. Fixes "format not a string literal and no
format arguments" warning in the av_log.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 01:21:01 +01:00
Derek Buitenhuis
0c251257b5 VBLE Decoder
Add a decoder for the VBLE Lossless Codec, which
still has a cult following. Used to be popular
several years ago on doom9.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 01:21:01 +01:00
Janne Grunau
29ae0565d9 vble: remove vble_error_close
It does not make much sense to factor the error handling to its own
av_always_inline function. Fixes "format not a string literal and no
format arguments" warning in the av_log.
2011-11-11 22:05:51 +01:00
Derek Buitenhuis
c433a3f9a5 VBLE Decoder
Add a decoder for the VBLE Lossless Codec, which
still has a cult following. Used to be popular
several years ago on doom9.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-11 22:46:47 +02:00
Justin Ruggles
b656c4d08e tta: use an integer instead of a pointer to iterate output samples 2011-11-11 14:18:22 -05:00
Justin Ruggles
5c210e2cb9 shorten: do not modify samples pointer when interleaving 2011-11-11 14:18:22 -05:00
Justin Ruggles
befc473c00 mpc7: only support stereo input.
The Musepack SV7 reference encoder converts mono to stereo when encoding.
2011-11-11 14:17:40 -05:00
Justin Ruggles
8dbc6d03c0 dpcm: do not try to decode empty packets 2011-11-11 14:17:39 -05:00
Justin Ruggles
e79da63282 dpcm: remove unneeded buf_size==0 check.
It is already checked in avcodec_decode_audio3()
2011-11-11 14:17:39 -05:00
Justin Ruggles
9d06037d48 twinvq: add SSE/AVX optimized sum/difference stereo interleaving 2011-11-11 14:13:58 -05:00
Justin Ruggles
7b966566da vqf/twinvq: pass vqf COMM chunk info in extradata
This is needed because the twinvq decoder cannot rely on bit_rate to be set.
The API documentation says that bit_rate is set by libavcodec, not by the
user.
2011-11-11 14:06:14 -05:00
Justin Ruggles
a8a6da4a0e twinvq: check for allocation failure in init_mdct_win() 2011-11-11 14:06:14 -05:00
Carl Eugen Hoyos
0b7aec5fa4 Make PAL8 pcx images opaque. 2011-11-11 18:40:19 +01:00
Carl Eugen Hoyos
e22eff964f Set palette for 1bit pcx.
The stored palette contains zeroes only.
Fixes ticket #637.
2011-11-11 18:40:19 +01:00
Sebastien Zwickert
89d7f92661 vda: use fast reallocation.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 16:23:23 +01:00
Mashiat Sarker Shakkhar
9ef5d707e6 Implement use_high_update_speed() and use_normal_update_speed()
(cherry picked from commit 9ebc93fa4623791eca9efeee4de65b23dc015de1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:30:50 +01:00
Mashiat Sarker Shakkhar
144d815912 Initialize num_logged_tiles and remove unnecessary codes
(cherry picked from commit 69bca779e5d8409cde336406a26b5173002cac97)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:30:46 +01:00
Mashiat Sarker Shakkhar
9634b1c6f2 Log index for each line of output
(cherry picked from commit 9e2ccb2de8d4dc5179cd86610b129500e6223be7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:30:41 +01:00
Mashiat Sarker Shakkhar
2f8b8f6953 Log tile size
(cherry picked from commit 257e5c4829cd916938c9e1922e50668636346f71)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:30:30 +01:00
Mashiat Sarker Shakkhar
6e4a86a3f8 Output decoded residues 2011-11-11 03:30:18 +01:00
Mashiat Sarker Shakkhar
8f8dcf4486 Replace placeholders with actual calls to clear_codec_buffers() and reset_codec() 2011-11-11 03:28:39 +01:00
Mashiat Sarker Shakkhar
80fa79a306 Implement lms_update()
(cherry picked from commit 17219c79360bc2bdaf3e7f47178af42fade140a8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:26:48 +01:00
Mashiat Sarker Shakkhar
afd930dca2 Implement lms_predict()
(cherry picked from commit 83e31db195b9d0a07b0526eab5780817d8ce9444)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:26:42 +01:00
Mashiat Sarker Shakkhar
f12f189638 Implement reset_codec()
(cherry picked from commit c56313aa7969691f1a779e5ac5666f012676836f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:26:35 +01:00
Mashiat Sarker Shakkhar
06b67051d5 Add missing syntax elements to WmallDecodeCtx
(cherry picked from commit 2d6ca09c0f6ea318e439b9b073f507c802623ced)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:26:26 +01:00
Mashiat Sarker Shakkhar
8a41fdf127 Add .recent syntax element to cdlms struct
(cherry picked from commit a7820f3c5a0f4d2a5f005f9ca3766d29b2111380)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:26:19 +01:00
Mashiat Sarker Shakkhar
a868b6fea9 Analysis and spec comparison
(cherry picked from commit 6b05ea8b690ecab0e98924f0887f24311843d080)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:26:12 +01:00
Mashiat Sarker Shakkhar
9152866455 Implement clear_codec_buffers()
(cherry picked from commit d34e3cf342219e9825125d4f9327cf1feab15c79)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:26:05 +01:00
Mashiat Sarker Shakkhar
fd9ea0402c Add buffers to context necessary for reverting cdmls and mclms filter 2011-11-11 03:25:30 +01:00
Mashiat Sarker Shakkhar
1f273373ec Analysis and spec comparison 2011-11-11 03:22:05 +01:00
Mashiat Sarker Shakkhar
7344b75c63 Cosmetics
(cherry picked from commit 3197968bedf9f0d6d3cccf11cfbd19c23063493b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 03:18:46 +01:00
Michael Niedermayer
6d91045d83 Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
  doc: update libavfilter documentation
  tls: Use the URLContext as logging context
  aes: Avoid illegal read and don't generate more key than we use.
  mpc7: Fix memset call in mpc7_decode_frame function
  atrac1: use correct context for av_log()
  apedec: consume the whole packet when copying to the decoder buffer.
  apedec: do not needlessly copy s->samples to nblocks.
  apedec: check output buffer size after calculating actual output size
  apedec: remove unneeded entropy decoder normalization.
  truespeech: use memmove() in truespeech_update_filters()
  vorbisdec: remove AVCODEC_MAX_AUDIO_FRAME_SIZE check
  vorbisdec: remove unneeded buf_size==0 check
  vorbisdec: return proper error codes instead of made-up ones
  http: Don't add a Range: bytes=0- header for POST
  sunrast: Check for invalid/corrupted bitstream
  http: Change the chunksize AVOption into chunked_post
  http: Add encoding/decoding flags to the AVOptions
  avconv: remove some codec-specific hacks
  crypto: add decoding flag to options.
  tls: use AVIO_FLAG_NONBLOCK instead of deprecated URL_FLAG_NONBLOCK
  ...

Conflicts:
	doc/libavfilter.texi
	libavcodec/atrac1.c
	libavcodec/sunrast.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 02:50:35 +01:00
K.Y.H
554caed2d3 cook: fix apparent typo in extradata parsing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 00:30:39 +01:00
Nir Ben David
083d9ba448 golomb: Fix overread in get_ur_golomb_jpegls()
Fixes Ticket600

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-10 23:09:44 +01:00
Carl Eugen Hoyos
0e609d7418 Fix some 1bit bmp samples, they are palletised.
Fixes ticket #632.
2011-11-10 23:07:27 +01:00
Alex Converse
88b2436911 mpc7: Fix memset call in mpc7_decode_frame function 2011-11-10 09:30:49 -08:00
Justin Ruggles
164fca39bd atrac1: use correct context for av_log() 2011-11-10 10:25:47 -05:00
Justin Ruggles
c298b2b8db apedec: consume the whole packet when copying to the decoder buffer.
This avoids artifically consuming a partial packet but ignoring remaining data
in subsequent calls.
2011-11-10 10:25:47 -05:00
Justin Ruggles
de157f2118 apedec: do not needlessly copy s->samples to nblocks.
also move nblocks to the local scope where it is used.
2011-11-10 10:25:47 -05:00
Justin Ruggles
4315c7d35a apedec: check output buffer size after calculating actual output size 2011-11-10 10:25:47 -05:00
Justin Ruggles
ad17207b51 apedec: remove unneeded entropy decoder normalization.
The decoder already skips data at the end of the packet without this.
Also remove 2 APEContext fields that were only used for the end-of-frame
normalization.
2011-11-10 10:25:47 -05:00
Justin Ruggles
59f4d1b8bb truespeech: use memmove() in truespeech_update_filters() 2011-11-10 10:25:46 -05:00
Justin Ruggles
41899b9acb vorbisdec: remove AVCODEC_MAX_AUDIO_FRAME_SIZE check
The user could provide a larger buffer, which is already checked separately
before writing output.
2011-11-10 10:25:46 -05:00
Justin Ruggles
e551a6f49a vorbisdec: remove unneeded buf_size==0 check 2011-11-10 10:25:46 -05:00
Justin Ruggles
f666276fa6 vorbisdec: return proper error codes instead of made-up ones 2011-11-10 10:25:46 -05:00
Michael Niedermayer
80f716cd45 mpeg4videodec: fix lml4 and frame threading without -vsync 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-10 13:51:38 +01:00
Laurent Aimar
2305742b2a sunrast: Check for invalid/corrupted bitstream
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2011-11-10 12:32:26 +01:00
Michael Niedermayer
525a8f3ba5 lavc: update AVCodecContext.delay documentation
Based on reimars suggestion
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-10 05:19:58 +01:00
Michael Niedermayer
3cc1af9dd9 pthreads: export the delay that was previously exported by mangling has_b_frames through
AVCodecContext.delay which was previously unused for decoders and fits better.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-10 05:19:58 +01:00
Michael Niedermayer
afc0a24d7d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avcodec: add support for planar signed 8-bit PCM.
  ra144enc: add sample_fmts list to ff_ra_144_encoder
  smackaud: use uint8_t* for 8-bit output buffer type
  smackaud: clip output samples
  smackaud: use sign_extend() for difference value instead of casting
  sipr: use a function pointer to select the decode_frame function
  sipr: set mode based on block_align instead of bit_rate
  sipr: do not needlessly set *data_size to 0 when returning an error
  ra288: fix formatting of LOCAL_ALIGNED_16
  udp: Allow specifying the local IP address
  VC1: Add bottom field offset to block_index[] to avoid rewriting (+10L)
  vc1dec: move an if() block.
  vc1dec: use correct hybrid prediction threshold.
  vc1dec: Partial rewrite of vc1_pred_mv()
  vc1dec: take ME precision into account while scaling MV predictors.
  lavf: don't leak corrupted packets

Conflicts:
	libavcodec/8svx.c
	libavcodec/ra288.c
	libavcodec/version.h
	libavformat/iff.c
	libavformat/udp.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-10 03:45:23 +01:00
Justin Ruggles
f1f6d3615f avcodec: add support for planar signed 8-bit PCM.
It is found in some 8svx files (e.g. ones created by SoX).
Currently the decoder reuses the 8svx functions because we already have
handling of a single large planar packet for the compressed 8svx codecs.
2011-11-09 17:48:54 -05:00
ami_stuff
dea8f6e18b lowercase FRWU string
8556406d38 (lavc: lowercase the FRWU codec name)
got partially reverted by ec6402b7c5
(lavc: use designated initialisers for all codecs.)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-09 23:10:07 +01:00
Justin Ruggles
fed5ca255f ra144enc: add sample_fmts list to ff_ra_144_encoder
This enables the user (i.e. avconv) to automatically convert to the supported
sample format if needed.
2011-11-09 16:53:23 -05:00
Justin Ruggles
818a3bdedf smackaud: use uint8_t* for 8-bit output buffer type
This matches the output sample format and the range of the output values.
2011-11-09 16:21:08 -05:00
Justin Ruggles
375ca0aca8 smackaud: clip output samples 2011-11-09 16:20:45 -05:00
Justin Ruggles
c86c3c8017 smackaud: use sign_extend() for difference value instead of casting 2011-11-09 16:19:52 -05:00
Sebastien Zwickert
701e5348d4 vda: set destination image buffer attributes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-09 21:19:39 +01:00
Justin Ruggles
979c8de549 sipr: use a function pointer to select the decode_frame function 2011-11-09 14:59:52 -05:00
Justin Ruggles
3468ff1060 sipr: set mode based on block_align instead of bit_rate
the user is not required to set bit_rate
2011-11-09 14:59:51 -05:00
Justin Ruggles
0005f9a35b sipr: do not needlessly set *data_size to 0 when returning an error 2011-11-09 14:59:51 -05:00
Justin Ruggles
9cb70ce34b ra288: fix formatting of LOCAL_ALIGNED_16 2011-11-09 13:45:50 -05:00
Michael Niedermayer
82a1d57575 fraps: check overread per sample instead of per line
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-09 19:40:59 +01:00
Michael Niedermayer
46082e6186 fraps: fix memleak
Found-by reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-09 19:33:33 +01:00
Michael Niedermayer
26ae9a5d7c pthreads: drop has_b_frames mangling, its buggy in many many ways,
not to mention race conditions and that its used for stream copy, used to determine IPB type by
applications and other things.
Fixes various frame drop/timestamp issues with frame multithreading.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-09 17:47:10 +01:00
Carl Eugen Hoyos
367468f148 Check extradata_size before accessing extradata.
Fixes ticket #627.
2011-11-09 14:04:22 +01:00
shahriman AMS
c33d4916fb VC1: Add bottom field offset to block_index[] to avoid rewriting (+10L)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-09 11:00:49 +01:00
shahriman AMS
62622d04eb vc1dec: move an if() block.
There are no reason for "if (c_valid) { ... }" to appear before
"if (b_valid) { ... }".

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-09 11:00:20 +01:00
shahriman AMS
4bceeaf0c1 vc1dec: use correct hybrid prediction threshold.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-09 10:53:24 +01:00
shahriman AMS
4344ce08f1 vc1dec: Partial rewrite of vc1_pred_mv()
The current code is a generalization of the earlier progressive MV
prediction code. This was supposed to predict MVs for both interlaced
and progressive pictures. But the interlaced MV prediction is buggy
and works mostly by luck.

This partially fixes interlaced MV prediction.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-09 10:51:58 +01:00
shahriman AMS
6475a6e1ca vc1dec: take ME precision into account while scaling MV predictors.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-09 10:51:22 +01:00
Michael Niedermayer
11e155c219 ra288: try to fix 10l typo that breaks compile on some platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-09 04:53:33 +01:00
Michael Niedermayer
4354788a89 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  tls: Use ERR_get_error() in do_tls_poll
  indeo3: Fix a fencepost error.
  mxfdec: Fix comparison of unsigned expression < 0.
  mpegts: set stream id on just created stream, not an unrelated variable
  ra288: return error if input buffer is too small
  ra288: utilize DSPContext.vector_fmul()
  ra288: use memcpy() to copy decoded samples to output
  mace: only calculate output buffer size once
  Remove redundant filename self-references inside files.
  indeo3data: add missing config.h #include for HAVE_BIGENDIAN
  x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory
  avplay: reset rdft when closing stream.
  doc/git-howto: expand format-patch and send-email notes.
  lavf: expand doxy for some AVFormatContext fields.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-09 02:59:49 +01:00
Michael Niedermayer
3bdfef31ac fraps: check for overread
Fixeds Ticket619

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-09 00:06:08 +01:00
Reimar Döffinger
fd791675d4 Fix nonsense buffer hints.
The codec uses all previous frames as reference frames, so they
certainly must be preserved and readable.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-08 22:16:10 +01:00
Alex Converse
1149fbc763 indeo3: Fix a fencepost error.
Found with asan and the venerable 1-dog.avi sample.
2011-11-08 10:59:52 -08:00
Justin Ruggles
2467d8d9ea ra288: return error if input buffer is too small 2011-11-08 12:36:56 -05:00
Justin Ruggles
0131e70af5 ra288: utilize DSPContext.vector_fmul() 2011-11-08 12:36:48 -05:00
Justin Ruggles
03e5d6118c ra288: use memcpy() to copy decoded samples to output 2011-11-08 12:36:41 -05:00
Justin Ruggles
f50b6be57d mace: only calculate output buffer size once 2011-11-08 12:36:14 -05:00
Diego Biurrun
ce33320b30 Remove redundant filename self-references inside files.
Filenames are brittle across renames and add no useful information.
2011-11-08 17:52:56 +01:00
Diego Biurrun
9412f81138 indeo3data: add missing config.h #include for HAVE_BIGENDIAN 2011-11-08 17:52:56 +01:00
Diego Biurrun
276b995d85 x86: drop pointless ARCH_X86 #ifdef from files in x86 subdirectory 2011-11-08 17:52:55 +01:00
Michael Niedermayer
33feba3abf Revert "lavc: Init AVFrame->opaque to AVCodecContext.opaque in avcodec_default_get_buffer()"
This commit causes problems for vlc, see https://trac.videolan.org/vlc/ticket/5518

This reverts commit 475fb67d0b.
2011-11-08 15:31:10 +01:00
Michael Niedermayer
ac3c895d93 Revert "Warn the user if lowres > max_lowres, set lowres to max_lowres and continue"
Changing the lowres value is risky because the user application may have a
local copy and not read back into it, or not undo some lowres dependant things.
A patch implementing this in ffplay is already on ffmpeg-dev, so this feature
should be back soon.

This reverts commit 125ea3ee06.
2011-11-08 03:33:58 +01:00
Michael Niedermayer
0bd42ae72c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avformat: Avoid a warning about mixed declarations and code
  BMV demuxer and decoder
  matroskaenc: Make sure the seekhead struct is freed even on seek failure
  mpeg12enc: Remove write-only variables.
  mpeg12enc: Don't set up run-level info for level 0.
  msmpeg4: Don't set up run-level info for level 0.
  avformat: Warn about using network functions without calling avformat_network_init
  avformat: Revise wording
  rdt: Set AVFMT_NOFILE on ff_rdt_demuxer
  rdt: Check the return value of avformat_open
  rtsp: Discard the dynamic handler, if it has an alloc function which failed
  dsputil: use cpuflags in x86 versions of vector_clip_int32()

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-08 02:03:14 +01:00
Kostya Shishkov
f545e00677 BMV demuxer and decoder
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-08 00:36:45 +02:00
Michael Niedermayer
c3d56f0ea3 proresenc: fix typo that caused the wrong dimensions to be used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07 22:35:55 +01:00
Vitor Sessak
22e25c002e mpegaudiodec: add SSE-optimized imdct36()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07 22:35:55 +01:00
Vitor Sessak
e32aaba358 mpegaudiodec: move imdct36() to MPADSPContext
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07 22:35:55 +01:00
Derek Buitenhuis
159609512c libutvideodec: Check if the decode initializes correctly
Actually check the return value of DecodeBegin, to make
sure that it has encountered no errors.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07 21:51:38 +01:00
Derek Buitenhuis
61d303c780 libutvideodec: Remove CODEC_CAP_LOSSLESS
Remove the CODEC_CAP_LOSSLESS flag, as it doesn't make
any sense for a decoder to use it.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07 21:51:34 +01:00
Derek Buitenhuis
70cf7bb958 libutvideodec: Make buf_size local
Since buf_size is only used in this one function, there
is no reason for it to be part of UtVideoContext.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07 21:51:29 +01:00
Alex Converse
090aaaf752 mpeg12enc: Remove write-only variables. 2011-11-07 10:53:55 -08:00
Alex Converse
7c5dfc174b mpeg12enc: Don't set up run-level info for level 0.
run: The number of zero coefficients preceding a non-zero coefficient,
in the scan order. The absolute value of the non-zero coefficient is
called "level".

The run-level code makes illegal reads when trying to set up tables for
nonsense level 0.
2011-11-07 10:50:48 -08:00
Alex Converse
a1684cf82d msmpeg4: Don't set up run-level info for level 0.
run: The number of zero coefficients preceding a non-zero coefficient,
in the scan order. The absolute value of the non-zero coefficient is
called "level".

The run-level code makes illegal reads when trying to set up tables for
nonsense level 0.
2011-11-07 10:48:53 -08:00
Derek Buitenhuis
b580ab6b8b libutvideodec: Fix typo
Remove extraneous space.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07 19:37:38 +01:00
Derek Buitenhuis
1ff1b5f7f6 libutvideodec: Width and height don't need to be unsigned
Width and height, as used in utvideo_decode_frame, do not
need to be unsigned, and it could cause sign-compare
warnings later on.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07 19:37:38 +01:00
Derek Buitenhuis
f44f093d60 libutvideodec: Fix name of extradata member
The frameinfo size member of the Ut Video extradata
was erroneously thought to be the number of stripes.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07 19:37:38 +01:00
Derek Buitenhuis
bc74c4712d libutvideodec: remove impossible pix_fmt case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07 15:01:19 +01:00
Derek Buitenhuis
e347519877 libutvideo: Don't try and output original_format
The original format field in Ut Video's extradata
should not be used to determine the output format.
Cases can occur where the original format differs
from the actual current format, and thus should
not be used as the output format. Instead, rely
solely on the FOURCC.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07 15:01:19 +01:00
Michael Niedermayer
13b7781ec8 Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
  x86inc: use sse versions of common macros instead of sse2 when applicable
  doc/APIchanges: add missing dates and hashes
  lavf: don't return from void av_update_cur_dts()
  Changelog: add more entries.
  Changelog: update ffmpeg/avconv incompatibility list.
  avconv: remove some redundant temporary variables.
  avconv: fix broken indentation
  avconv: move copy_initial_nonkeyframes to the options context.
  avconv: use file:stream instead of file.stream in log messages.
  doc/avconv: elaborate on basic functionality.
  doc/avconv: -sample_fmts, not -help sample_fmts prints the sample formats
  openssl: Only use CRYPTO_set_id_callback on OpenSSL < 1.0.0
  Call avformat_network_init/deinit in the programs
  Remove leftover includes of strings.h
  avutil: Don't allow using strcasecmp/strncasecmp
  Replace all usage of strcasecmp/strncasecmp
  avstring: Add locale independent implementations of strcasecmp/strncasecmp
  avstring: Add locale independent implementations of toupper/tolower
  cosmetics: insert some spaces in explicit enum value assignments
  move 8SVX audio codecs to the audio codec list part on the next bump
  ...

Conflicts:
	avprobe.c
	doc/APIchanges
	ffplay.c
	ffserver.c
	libavcodec/avcodec.h
	libavdevice/bktr.c
	libavdevice/v4l.c
	libavdevice/v4l2.c
	libavformat/matroskaenc.c
	libavformat/wtv.c
	libavutil/avstring.c
	libavutil/avstring.h
	libavutil/avutil.h
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-07 03:01:43 +01:00
Justin Ruggles
b8f02f5b4e dsputil: use cpuflags in x86 versions of vector_clip_int32() 2011-11-06 20:50:06 -05:00
Reimar Döffinger
54a09f18e3 Fix av_packet_split_side_data.
p cannot be calculated before av_dup_packet since that one
might change avpkt->data, causing invalid reads and a
non-working range check.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-06 09:37:34 +01:00
Kostya Shishkov
66760b30a3 cosmetics: insert some spaces in explicit enum value assignments
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-06 08:13:11 +01:00
Kostya Shishkov
19900d60fd move 8SVX audio codecs to the audio codec list part on the next bump
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-06 08:12:42 +01:00
Kostya Shishkov
0e288b8c52 deprecate codec IDs that won't ever be used
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-11-06 07:41:58 +01:00
Michael Niedermayer
d8cab5c26b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  http: Remove the custom function for disabling chunked posts
  rtsp: Disable chunked http post through AVOptions
  movdec: Set frame_size for AMR
  h264_weight: remove duplication functions.
  swscale: align vertical filtersize by 2 on x86.
  libavfilter: reindent.
  matroskadec: empty blocks are in fact valid.
  avfilter: don't abort() on zero-size allocations.
  h264: improve calculation of codec delay.
  movenc: Set a correct packet size for AMR-NB mode 15, "no data"
  avformat: Add functions for doing global network initialization
  avformat: Add the https protocol
  avformat: Add the tls protocol, using OpenSSL or gnutls
  avformat: Initialize gnutls in ff_tls_init()
  w32threads: Wrap the mutex functions in inline functions returning int
  configure: Allow linking to the gnutls library
  avformat: Add ff_tls_init()/deinit() that initialize OpenSSL
  configure: Allow linking to openssl
  avcodec: Allow locking and unlocking an avformat specific mutex
  avformat: Split out functions from network.h to a new file, network.c

Conflicts:
	Changelog
	configure
	doc/APIchanges
	libavcodec/internal.h
	libavcodec/version.h
	libavfilter/formats.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-06 02:23:34 +01:00
Joakim Plate
29a29226bb Set avctx->coded_width/height to uncropped h264 sizes
avctx->width/height remain right/bottom cropped as previous behaviour.

Hardware decoders need to know the uncropped data to allocate surfaces
of correct height. Some hardware is picky and fails to decoder properly
if a surface larger than needed is used during decode, so just aligning
up is not enough.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-06 01:46:14 +01:00
Michael Niedermayer
439e1d196b libvpxenc: Fix "Additional information: g_lag_in_frames out of range [..25]"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-06 00:09:39 +01:00
Reimar Döffinger
d9010daa6f Set AVFrame reference before reget_buffer.
Otherwise it might return a write-only frame which would break
decoding completely.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 23:55:46 +01:00
Reimar Döffinger
266f6eefc6 nuv: do not use data not initialized by LZO decompression.
This fixes visible corruption in the incomplete last frame
of the FATE sample.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 23:53:47 +01:00
Reimar Döffinger
95e1dfee76 nuv: Fix combination of size changes and LZO compression.
There were multiple issues, for example might we have to re-run
the decompression when the size of the buffer increased,
we should always use a decompression buffer large enough for
the header (so we do not get stuck when the size is too small).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 23:52:23 +01:00
Reimar Döffinger
6f3ebcc320 Check NUV per-frame header for validity.
Since it contains dimensions parsing an invalid one has rather
annoying effects.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 23:33:49 +01:00
Reimar Döffinger
4e6413c67d rtjpeg: check get_block return value for error.
This avoids crashes due to reading out-of-bounds.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 23:25:20 +01:00
Reimar Döffinger
fffa4530f9 Simplify using get_bits_left.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 23:25:20 +01:00
Reimar Döffinger
7f6c828f2e Use FFALIGN.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 23:25:20 +01:00
Reimar Döffinger
371e165443 Try to set AVFrame.reference to correct values.
I am not sure these new values are correct, not am I sure
the semantics are a good idea since we do not seem to make any
use of them but they caused a lot of confusion, but this
seems to make things closer to matching the documentation.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 23:25:20 +01:00
Michael Niedermayer
fb2288834b h264: fix ssse3 biweight code with weights of 128
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-05 21:37:44 +01:00
Reimar Döffinger
49baf44c24 Make ff_mba_* arrays const.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 15:37:02 +01:00
Reimar Döffinger
db076a2c48 Make fdct_r_row_sse2 const.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 15:37:02 +01:00
Reimar Döffinger
b883c879aa Make AMR tables of lookup filter tables const.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 15:37:02 +01:00
Reimar Döffinger
9663b8da9a Make tab_frw_01234567_sse2 const.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 15:37:01 +01:00
Ronald S. Bultje
717401aff2 h264_weight: remove duplication functions. 2011-11-05 07:16:30 -07:00
Ronald S. Bultje
ea2bb12e3e h264: improve calculation of codec delay.
Fixes the following conformance suite samples:
HCBP1_HHI_A.264, HCBP2_HHI_A.264, HCMP1_HHI_A.264 (main)
HCHP1_HHI_B.264, HCHP2_HHI_A.264, HCHP3_HHI_A.264 (frext)
2011-11-05 06:58:52 -07:00
Clément Bœsch
454f165728 j2kdec: fix a bunch of const compiler warnings. 2011-11-05 12:56:39 +01:00
Martin Storsjö
8148631269 w32threads: Wrap the mutex functions in inline functions returning int
This allows using these wrappers in the gcrypt mutex callbacks.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-05 12:09:24 +02:00
Martin Storsjö
2d1b6fb72b avcodec: Allow locking and unlocking an avformat specific mutex
This extends the lock manager in avcodec to manage two separate
mutexes via the user-specified lock functions.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-05 12:08:53 +02:00
Michael Niedermayer
6ace8374ba Merge remote-tracking branch 'qatar/master'
* qatar/master:
  binkaudio: expand quant_table to accommodate all possible values
  libx264: Set the default of the rc_lookahead option to -1
  avcodec: Set flags2 default value depending on availability
  configure: declare dependency of h264_vaapi_hwaccel on h264_decoder

Conflicts:
	configure
	libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-05 01:46:14 +01:00
Jordi Ortiz
8b1032c923 dwt: Code make up, removed gotos
(cherry picked from commit 14880406e1277cef91d9b22a4d9b3bf91f8ea4ca)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-05 00:02:38 +01:00
Jordi Ortiz
db3463e9c3 Dirac: Added endif comments
(cherry picked from commit c023d4db3688cd4f0fa47c472b33eb343b0d6db1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-05 00:02:31 +01:00
Jordi Ortiz
fca712df09 Dirac: Specific struct initializers in AVCodec initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-05 00:02:11 +01:00
Jordi Ortiz
aae7a5e36d Dirac: Removed goto + some code make up
(cherry picked from commit 8db434f8a6d210f7fd2f28ba325927d7a5dd04b9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-04 23:59:33 +01:00
Jordi Ortiz
4bb2b5afc9 dwt: removed some warnings in make checkheaders
(cherry picked from commit 1124056ac054842f36866b4dabb9f8aae0ad06b6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-04 23:59:28 +01:00
Jordi Ortiz
1b95b52c0a Dirac: Solved problem with make checkheaders
(cherry picked from commit d611ea0a44f3e4f67fef7ba916da5a25adef58da)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-04 23:59:20 +01:00
Derek Buitenhuis
682e0eaf14 Fix libutvideo wrapper name
Change the libutvideo wrapper name to "libutvideo", as
it currently conflicts with the native utvideo decoder's
name of "utvideo".

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-04 18:05:49 +01:00
Justin Ruggles
add7b1140f binkaudio: expand quant_table to accommodate all possible values 2011-11-04 10:23:53 -04:00
Martin Storsjö
c38404ee1a libx264: Set the default of the rc_lookahead option to -1
This allows it to use the defaults specified by preset/tune,
without overwriting it with the default value from the
AVCodecContext field.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-04 12:46:35 +02:00
Martin Storsjö
adc85ce20b avcodec: Set flags2 default value depending on availability
This makes the code compile when FF_API_X264_GLOBAL_OPTS or
FF_API_LAME_GLOBAL_OPTS is 0.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-04 12:46:33 +02:00
Michael Niedermayer
259a960f1b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vp6: Fix illegal read.
  avfilter: Don't copy garbage from the stack when setting up video pictures.
  avcodec: Make sure codec_type is set by avcodec_get_context_defaults2
  avcodec: Remove a misplaced and useless attribute_deprecated
  avconv: add -dump_attachment option.
  avconv: add -attach option.
  avconv: make negative mappings disable only streams from the specified file
  fmtconvert: fix int32_to_float_fmul_scalar() for windows x86_64

Conflicts:
	libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-04 01:44:06 +01:00
Alex Converse
2a6eb06254 vp6: Fix illegal read. 2011-11-03 16:40:34 -07:00
Michael Niedermayer
23acfcd9e5 h264: favor coded_width in resolution chnaged checks
Suggested-by: Joakim Plate <elupus@ecce.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-03 20:21:01 +01:00
Michael Niedermayer
475fb67d0b lavc: Init AVFrame->opaque to AVCodecContext.opaque in avcodec_default_get_buffer()
this should allow some simplifications in some applications.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-03 14:54:15 +01:00
Martin Storsjö
cae4f4b77e avcodec: Make sure codec_type is set by avcodec_get_context_defaults2
This function used to set codec_type. With the current fallback
implementation based on avcodec_get_context_defaults3, codec_type
won't be set to the value passed in, but will be set to
AVMEDIA_TYPE_UNKNOWN. Legacy callers of this function might expect
this field to be set to the value passed in.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-03 13:29:48 +02:00
Martin Storsjö
1b6da627d4 avcodec: Remove a misplaced and useless attribute_deprecated
If attribute_deprecated is used in an enum declaration, it
should follow the 'enum' keyword, otherwise it's ignored
silently. This is the only case of attribute_deprecated for
enum declarations currently.

Currently, this attribute_deprecated doesn't have any effect.
If moved to the right place, it emits a warning every single
time avcodec.h is included, like this:

avcodec.h:2827: warning: ‘AVLPCType’ is deprecated (declared at avcodec.h:543)

There is already a working attribute_deprecated for the
corresponding field in AVCodecContext, so therefore this
one shouldn't be needed.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-03 09:47:57 +02:00
Justin Ruggles
5463e83dbc fmtconvert: fix int32_to_float_fmul_scalar() for windows x86_64
The calling convention only allows 4 non-stack parameter, with each
float or int register being skipped if not used.

fixes Bug 64
2011-11-02 21:44:58 -04:00
Michael Niedermayer
988f585fcb Merge remote-tracking branch 'qatar/master'
* qatar/master: (44 commits)
  replacement Indeo 3 decoder
  gsm demuxer: do not allocate packet twice.
  flvenc: use first packet delay as global delay.
  ac3enc: doxygen update.
  imc: return error codes instead of 0 for error conditions.
  imc: return meaningful error codes instead of -1
  imc: do not set channel layout for stereo
  imc: validate channel count
  imc: check for ff_fft_init() failure
  imc: check output buffer size before decoding
  imc: use DSPContext.bswap16_buf() to byte-swap packet data
  rtsp: add allowed_media_types option
  libgsm: add flush function to reset the decoder state when seeking
  libgsm: simplify decoding by using a loop
  gsm: log error message when packet is too small
  libgsmdec: do not needlessly set *data_size to 0
  gsmdec: do not needlessly set *data_size to 0
  gsmdec: add flush function to reset the decoder state when seeking
  libgsmdec: check output buffer size before decoding
  gsmdec: log error message when output buffer is too small.
  ...

Conflicts:
	Changelog
	ffplay.c
	libavcodec/indeo3.c
	libavcodec/mjpeg_parser.c
	libavcodec/vp3.c
	libavformat/cutils.c
	libavformat/id3v2.c
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-03 02:16:26 +01:00
Maxim Poliakovski
594b54b51e replacement Indeo 3 decoder
The new decoder is much smaller and has better code quality.
Cleanup and fixes courtesy of Kostya Shishkov.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-11-03 00:59:12 +01:00
Justin Ruggles
c2d9a65bc0 ac3enc: doxygen update.
Add some parameters to existing function documentation.
Remove some unneeded documentation.
Convert some static function documentation to non-doxygen style.
2011-11-02 17:21:45 -04:00
Justin Ruggles
a4998e448f imc: return error codes instead of 0 for error conditions.
This fixes a bug where the whole buffer was returned as decoded audio due to
*data_size not being set to zero and the return value being >= 0.
2011-11-02 17:02:22 -04:00
Justin Ruggles
08e5cd3810 imc: return meaningful error codes instead of -1 2011-11-02 17:02:22 -04:00
Justin Ruggles
0473f29b60 imc: do not set channel layout for stereo
we only support decoding of mono imc
2011-11-02 17:02:22 -04:00
Justin Ruggles
7b7f47e733 imc: validate channel count
ask for a sample if not mono
2011-11-02 17:02:22 -04:00
Justin Ruggles
95fee70d67 imc: check for ff_fft_init() failure 2011-11-02 17:02:22 -04:00
Justin Ruggles
86962b13f6 imc: check output buffer size before decoding 2011-11-02 17:02:22 -04:00
Justin Ruggles
e9362aaedf imc: use DSPContext.bswap16_buf() to byte-swap packet data 2011-11-02 17:02:22 -04:00
Mean
d1590a0a2b vc1dec: Fix CODEC_FLAG_LOW_DELAY
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-02 20:32:59 +01:00
Michael Niedermayer
f51e5015ad mpeg4videodec: export quarter_sample & divx_packed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-02 20:01:04 +01:00
Justin Ruggles
20e081dddc libgsm: add flush function to reset the decoder state when seeking 2011-11-02 14:41:17 -04:00
Justin Ruggles
480324e7ca libgsm: simplify decoding by using a loop 2011-11-02 14:41:17 -04:00
Justin Ruggles
9d52f0a711 gsm: log error message when packet is too small 2011-11-02 14:41:17 -04:00
Justin Ruggles
9671db8245 libgsmdec: do not needlessly set *data_size to 0 2011-11-02 14:41:16 -04:00
Justin Ruggles
a2e255783e gsmdec: do not needlessly set *data_size to 0 2011-11-02 14:41:16 -04:00
Justin Ruggles
fc43fc9faa gsmdec: add flush function to reset the decoder state when seeking 2011-11-02 14:41:16 -04:00
Justin Ruggles
b03761b130 libgsmdec: check output buffer size before decoding 2011-11-02 14:41:16 -04:00
Justin Ruggles
bac2597a32 gsmdec: log error message when output buffer is too small.
also return AVERROR(EINVAL) instead of -1
2011-11-02 14:41:16 -04:00
Justin Ruggles
d9c6eece21 gsm: use av_get_bytes_per_sample() in frame_bytes calculation 2011-11-02 14:41:16 -04:00
Michael Niedermayer
146f99cfec h264: add nal_length_size and is_avc to the publically readable fields
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-02 18:53:57 +01:00
Michael Niedermayer
913bc7996e lavc: fix avcodec_get_type()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-02 18:53:50 +01:00
Sebastien Zwickert
d66ee6ac48 HWAccel: adds Video Decoder Acceleration (VDA) module for Mac OS X.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-02 15:47:27 +01:00
Diego Biurrun
f36b390275 Replace some forgotten FFmpeg references by Libav. 2011-11-02 10:42:55 +01:00
Diego Biurrun
2f5df0b12c Replace ffmpeg references with more accurate libav* references. 2011-11-02 10:42:55 +01:00
Diego Biurrun
20566eb0f0 Replace outdated references to ffmpeg tool with avconv. 2011-11-02 10:42:54 +01:00
Diego Biurrun
124e28847b Remove some stray unnecessary ffmpeg references. 2011-11-02 10:42:54 +01:00
Diego Biurrun
d1dfcb0829 vp3: remove some pointless comments 2011-11-02 10:42:54 +01:00
Anton Khirnov
5511ad14fe lavc: use designated initialisers for parsers. 2011-11-02 10:03:43 +01:00
Clément Bœsch
971e710438 dsputil: fix typo (referece -> reference). 2011-11-02 07:54:48 +01:00
Michael Niedermayer
c36edf3899 jpeg: rgb support
Fixes Ticket297

Based on a patch by Carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-02 02:26:28 +01:00
Justin Ruggles
da24963725 g726dec: add flush() function to reset state when seeking 2011-11-01 21:23:04 -04:00
Justin Ruggles
97f5dd1d84 g726: don't pass index to g726_reset()
calculate it from c->code_size instead.
2011-11-01 21:23:04 -04:00
Justin Ruggles
615b2a2cf5 g726enc: add private option for setting code size directly.
This is an easy alternative to setting bit_rate. This patch also selects the
closest bit_rate to the requested one rather than requiring an exact value.
2011-11-01 21:23:04 -04:00
Justin Ruggles
7abb73d4ba g726: wrap the decoder functions with a CONFIG_ADPCM_G726_DECODER check 2011-11-01 21:23:04 -04:00
Justin Ruggles
437c11ca16 g726: group the g726_encoder AVCodec with the other encoding functions 2011-11-01 21:23:04 -04:00
Justin Ruggles
50969c0f46 g726: return AVERROR(EINVAL) instead of -1 for invalid channel count 2011-11-01 21:23:03 -04:00
Justin Ruggles
50c466d609 g726enc: use av_assert0() for sample_rate validation
This should never happen, but the check avoids a divide-by-zero.
2011-11-01 21:23:03 -04:00
Justin Ruggles
9e78d8cfdf g726: treat sample rates other than 8kHz as unofficial. 2011-11-01 21:23:03 -04:00
Justin Ruggles
6e8d4a7afb g726dec: remove the sample_rate validation 2011-11-01 21:23:03 -04:00
Justin Ruggles
6ac34eed54 g726: use bits_per_coded_sample instead of bitrate to determine mode
This requires some workarounds in the WAV muxer and demuxer. We need to write
the correct bits_per_coded_sample and block_align in the muxer. In the
demuxer, we cannot rely on the bits_per_coded_sample value, so we use the bit
rate and sample rate to determine the value.

This avoids having the decoder rely on AVCodecContext.bit_rate, which is not
required to be set by the user for decoding according to our API.
2011-11-01 21:23:03 -04:00
Justin Ruggles
d405237bae g726: split the init function for the encoder and decoder
This also allows for not having a decoder close function.
2011-11-01 21:23:03 -04:00
Justin Ruggles
c8d36d254e g726: pre-calculate the number of output samples.
Allows for checking output buffer size and simplification of decoding loop.
2011-11-01 21:23:03 -04:00
Justin Ruggles
e61a670b53 g726: use int16_t instead of short 2011-11-01 21:23:02 -04:00
Michael Niedermayer
bd2bcf97fa dirac: drop unused END_HORIZONTAL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 22:01:11 +01:00
Michael Niedermayer
e985d71926 dirac: fix horizontal_compose_dd97i_ssse3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 22:01:11 +01:00
Michael Niedermayer
754539a409 dirac: Fix mmx/sse haar wavelet compose
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 22:01:11 +01:00
Carl Eugen Hoyos
ee93363f8f Fix compilation of dct-test on ia32. 2011-11-01 15:48:03 +01:00
Vladimir Voroshilov
f0506a8993 Two extra samples are required before top of the in buffer rather than out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 13:08:41 +01:00
Michael Niedermayer
3e5ea9e471 dirac: disable ff_horizontal_compose_haar0i_sse2() the function is not bitexact
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 00:47:25 +01:00
Michael Niedermayer
d2ea38ddb7 dirac: alignment for dirac_hpel_filter_v has been fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 17:03:03 +01:00
Michael Niedermayer
18f2ae3b77 dirac: alignment for add_dirac_obmc has been fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 17:00:59 +01:00
Michael Niedermayer
4debdee6ce dirac: alignment for add_rect_clamped has been fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 17:00:40 +01:00
Michael Niedermayer
66b6d7bcd7 dirac: alignment for put_signed_rect_clamped has been fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 17:00:03 +01:00
Michael Niedermayer
2eecf63086 dirac: alignment for dirac_hpel_filter_v() has been fixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 16:59:23 +01:00
Michael Niedermayer
08bef053a0 dirac: fix stride alignment
This code was already added by Yuvi in c82cbea68273c6f08c4d0e94fc9fd50bfdea4e2b
It was subsequently lost somehow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 16:46:50 +01:00
Michael Niedermayer
a14a0d7c2c dirac: fix segfault in horizontal_compose_haar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 16:34:26 +01:00
Michael Niedermayer
c0dbab964d dirac: ff_diracdsp_init_mmx() is only compiled when yasm is available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 02:47:23 +01:00
Michael Niedermayer
0489af478e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libdirac/libschroedinger: Drop unnecessary symbol prefixes.
  cmdutils: check fread() return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-31 02:26:47 +01:00
Carl Eugen Hoyos
171727d530 Bump libavcodec minor version for the Dirac decoder. 2011-10-31 01:10:07 +01:00
Michael Niedermayer
0bc5677e98 dirac: enable ff_spatial_idwt_init_mmx()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 23:29:08 +01:00
Michael Niedermayer
e8b891b7f0 dirac: enable diracdsp_mmx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 23:28:48 +01:00
Michael Niedermayer
3cb0686eea dirac: ff_horizontal_compose_dd97i_ssse3 does not work yet, thus disable it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 23:28:07 +01:00
Michael Niedermayer
a1f3b18bf5 dirac: put_dirac_pixels8_mmx() does not work yet, thus disable it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 23:27:38 +01:00
Michael Niedermayer
22fe93ea39 dirac: add_rect_clamped does currently not receive aligned data, thus use unaligned accesses.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 23:26:29 +01:00
Michael Niedermayer
d532e9223e dirac: put_signed_rect_clamped does currently not receive aligned data, thus use unaligned accesses.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 23:25:49 +01:00
Michael Niedermayer
5f34092b13 dirac; dirac_hpel_filter_h does currently not receive aligned data thus use unaligned accesses.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 23:25:08 +01:00
Michael Niedermayer
f0d616e76f dirac: dirac_hpel_filter_v does currently not receive aligned data, thus use unaligned accesses.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 23:24:19 +01:00
Jordi Ortiz
49aa397414 Dirac: More formating
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 21:50:17 +01:00
Jordi Ortiz
ca239e1c37 Dirac: Doxygen comments and some formatting enhancements
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 21:50:17 +01:00
Jordi Ortiz
4c150e3f4f Dirac: allcodecs in alphabetical order
(cherry picked from commit b44c20e9f04f29aff09f64659b3c2926e08b46f8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 21:50:16 +01:00
Jordi Ortiz
e3cfe54145 Dirac now returns AVFrames instead of DiracFrames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 21:50:16 +01:00
multiple authors
5d50fcc549 DIRAC Decoder stable version, MMX support removed.
Look for MMX_DISABLED to find the disabled functions.

Authors of this code are Marco Gerards <marco@gnu.org> and David Conrad <lessen42@gmail.com>
With changes from Jordi Ortiz <nenjordi@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 21:50:08 +01:00
Diego Biurrun
45235d69c2 libdirac/libschroedinger: Drop unnecessary symbol prefixes.
The names used in the libdirac/libschroedinger wrappers are long enough as-is.
Bloating them with unnecessary prefixes makes them even more unwieldy.
2011-10-30 21:40:52 +01:00
Stefano Sabatini
5b1a06b1c9 libmp3lame: log error message in case of invalid number of channels
Also return meaningful error number in place of -1.
Improve feedback.
2011-10-30 21:10:54 +01:00
Reimar Döffinger
b264e5ca13 Remove pointless per-frame malloc/free.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-10-30 19:12:26 +01:00
David Conrad
25a6c59487 MMX put_no_rnd_pixels_l2 2011-10-30 19:06:57 +01:00
Michael Niedermayer
3c32a941b7 propresenc: fix missed LE pixfmt occurance
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 04:17:01 +01:00
Michael Niedermayer
64a41dc21f proresenc: the encoder expects native endian input.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 02:55:01 +01:00
Michael Niedermayer
d17e7070a0 Merge remote-tracking branch 'qatar/master'
* qatar/master: (51 commits)
  cin audio: use sign_extend() instead of casting to int16_t
  cin audio: restructure decoding loop to avoid a separate counter variable
  cin audio: use local variable for delta value
  cin audio: remove unneeded cast from void*
  cin audio: validate the channel count
  cin audio: remove unneeded AVCodecContext pointer from CinAudioContext
  dsicin: fix several audio-related fields in the CIN demuxer
  flacdec: use av_get_bytes_per_sample() to get sample size
  dca: handle errors from dca_decode_block()
  dca: return error if the frame header is invalid
  dca: return proper error codes instead of -1
  utvideo: handle empty Huffman trees
  binkaudio: change short to int16_t
  binkaudio: only decode one block at a time.
  binkaudio: store interleaved overlap samples in BinkAudioContext.
  binkaudio: pre-calculate quantization factors
  binkaudio: add some buffer overread checks.
  atrac3: support float or int16 output using request_sample_fmt
  atrac3: add CODEC_CAP_SUBFRAMES capability
  atrac3: return appropriate error codes instead of -1
  ...

Conflicts:
	libavcodec/atrac1.c
	libavcodec/dca.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 01:33:41 +02:00
Michael Niedermayer
1af3571e05 mjpeg_parser: Rewrite to skip marker segments
Based on code by Aaron Miller <amiller@atlasdigital.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 00:29:17 +02:00
Michael Niedermayer
429b3cd6f5 mjpeg_parser: add MJPEGParserContext
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-30 00:28:25 +02:00
Carl Eugen Hoyos
0387ad892c Be more verbose about unsupported H.264 bit-depths. 2011-10-29 23:41:05 +02:00
Justin Ruggles
7d1b17b833 cin audio: use sign_extend() instead of casting to int16_t 2011-10-29 16:43:40 -04:00
Justin Ruggles
405af43104 cin audio: restructure decoding loop to avoid a separate counter variable
Also check output buffer size instead of truncating output.
2011-10-29 16:43:40 -04:00
Justin Ruggles
859bdc33e4 cin audio: use local variable for delta value 2011-10-29 16:43:40 -04:00
Justin Ruggles
64e19ba48b cin audio: remove unneeded cast from void* 2011-10-29 16:43:40 -04:00
Justin Ruggles
03381c12b3 cin audio: validate the channel count 2011-10-29 16:43:40 -04:00
Justin Ruggles
664eb77dc3 cin audio: remove unneeded AVCodecContext pointer from CinAudioContext 2011-10-29 16:43:40 -04:00
Justin Ruggles
5bd0343bee flacdec: use av_get_bytes_per_sample() to get sample size 2011-10-29 16:05:25 -04:00
Justin Ruggles
272fcc32bb dca: handle errors from dca_decode_block()
Return error if core block decoding fails.
Do not enable XCh if XCh extension block decoding fails.
2011-10-29 16:04:07 -04:00
Justin Ruggles
aae6eead6a dca: return error if the frame header is invalid 2011-10-29 16:04:07 -04:00
Justin Ruggles
f44059d260 dca: return proper error codes instead of -1 2011-10-29 16:04:06 -04:00
Kostya Shishkov
46e1af3b0f utvideo: handle empty Huffman trees
If the frame is filled with the same colour, encoder may produce no data
and the fill value is indicated by zero code length (the rest of symbols
will have 0xFF for code length, meaning invalid).  So such Huffman trees
should be treated specially.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-10-29 12:54:08 -07:00
Justin Ruggles
425a843505 binkaudio: change short to int16_t 2011-10-29 15:16:54 -04:00
Justin Ruggles
4f4e19480a binkaudio: only decode one block at a time.
This prevents truncating output due to an output buffer that is too small for
all blocks. There is no limit on the number of blocks in a packet.
2011-10-29 15:16:54 -04:00
Justin Ruggles
eaddd29e00 binkaudio: store interleaved overlap samples in BinkAudioContext.
This fixes the requirement for the buffer size to be larger than the number of
samples actually decoded.
2011-10-29 15:16:54 -04:00
Justin Ruggles
9f48039a37 binkaudio: pre-calculate quantization factors 2011-10-29 15:16:53 -04:00
Justin Ruggles
101ef19ef4 binkaudio: add some buffer overread checks.
This stops decoding before overreads instead of after.
2011-10-29 15:16:53 -04:00
Justin Ruggles
2073224697 atrac3: support float or int16 output using request_sample_fmt 2011-10-29 15:06:32 -04:00
Justin Ruggles
a047851329 atrac3: add CODEC_CAP_SUBFRAMES capability
the decoder can handle multiple frames in a packet
2011-10-29 15:06:32 -04:00
Justin Ruggles
8f98577d4d atrac3: return appropriate error codes instead of -1 2011-10-29 15:06:32 -04:00
Justin Ruggles
47b617021d atrac3: make sure all memory is freed on init failure 2011-10-29 15:06:32 -04:00
Justin Ruggles
c91613857d atrac3: add a couple macro constants 2011-10-29 15:06:31 -04:00
Justin Ruggles
1fead73d7b atrac3: return error if packet is too small 2011-10-29 15:06:31 -04:00
Justin Ruggles
7e4881a2d0 atrac3: check output buffer size before decoding 2011-10-29 15:06:31 -04:00
Justin Ruggles
6ba7f78bbb atrac3: use separate pointers for each channel in decodeFrame() 2011-10-29 15:06:31 -04:00
Justin Ruggles
5e76b8bb76 atrac3: use optimized float_interleave() function for stereo interleaving 2011-10-29 15:06:31 -04:00
Justin Ruggles
8af33cb38a atrac3: decode mono directly to the output buffer 2011-10-29 15:06:31 -04:00
Justin Ruggles
c4a6fde33f atrac3: decode output to float samples instead of converting to s16 2011-10-29 15:06:31 -04:00
Justin Ruggles
f20dd574f1 atrac1: return appropriate error codes instead of -1 2011-10-29 15:06:31 -04:00
Justin Ruggles
6dc7dd7af4 atrac1: check for ff_mdct_init() failure 2011-10-29 15:06:31 -04:00
Justin Ruggles
21dcecc310 atrac1: use optimized float_interleave() function for stereo interleaving 2011-10-29 15:06:31 -04:00
Justin Ruggles
96b5702efe atrac1: fix a typo 2011-10-29 15:06:31 -04:00
Justin Ruggles
bff5b2c1ca atrac1: validate number of channels 2011-10-29 15:06:31 -04:00
Justin Ruggles
9a35ff3841 atrac1: decode mono audio directly to output buffer
For stereo we need to use intermediate planar buffers, but mono does not need
to be deinterleaved so the output buffer can be used directly.
2011-10-29 15:06:31 -04:00
Justin Ruggles
33684b9c12 atrac1: check output buffer size before decoding 2011-10-29 15:06:30 -04:00
Justin Ruggles
5c353eb8e3 cook: return AVERROR_PATCHWELCOME instead of ENOTSUP
ENOTSUP is not defined on some systems
2011-10-29 14:32:55 -04:00
Justin Ruggles
e34c6c9708 cook: check output buffer size before decoding 2011-10-29 13:43:28 -04:00
Justin Ruggles
6631294c26 cook: do not needlessly set *data_size to 0 2011-10-29 13:43:28 -04:00
Justin Ruggles
b277ebd508 cook: remove pointless return statements 2011-10-29 13:43:28 -04:00
Justin Ruggles
c9c841e231 cook: simplify decouple_info() 2011-10-29 13:43:28 -04:00
Justin Ruggles
f193c96f49 cook: return appropriate error codes instead of -1 2011-10-29 13:43:28 -04:00
Justin Ruggles
e694831f9d cook: avoid hardcoded sizes in sizeof() 2011-10-29 13:43:28 -04:00
Justin Ruggles
776e9815a5 cook: remove unneeded #includes 2011-10-29 13:43:28 -04:00
Justin Ruggles
c25df22365 cook: output float samples instead of converting to int16 2011-10-29 13:43:28 -04:00
Michael Niedermayer
9b04f51d5f proresenc: add forgotten bytestream include
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-29 16:53:37 +02:00
Reimar Döffinger
c5865a8967 Use bytestream functions to write header.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-10-29 15:48:43 +02:00
Reimar Döffinger
d9f4dc52a0 Only do 1 malloc instead of 3 and check for failure.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-10-29 15:48:43 +02:00
Reimar Döffinger
5c9b9165cd Remove unnecessary memset.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-10-29 15:48:43 +02:00
Reimar Döffinger
a2db46b883 Remove useless casts.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-10-29 15:48:43 +02:00
Carl Eugen Hoyos
4d2f991187 Bump libavcodec minor version for the ProRes encoder. 2011-10-29 13:17:08 +02:00
Carl Eugen Hoyos
7afa6b4458 Warn if YCgCo colourspace is detected in H.264. 2011-10-29 13:16:47 +02:00
Anatoliy Wasserman
70bab5847e Apple ProRes encoder
Signed-off-by: Anatoliy Wasserman <anatoliy.wasserman@yandex.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-29 12:46:05 +02:00
Kostya Shishkov
9a173575fd utvideo: account for coupled lines in YUV420 format
Luma slices in YUV420 colourspace should have height in multiple of two since
they have the same line of chrominance data corresponding to pair of them.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-10-28 23:51:58 -07:00
Ronald S. Bultje
8370e426e4 vp3: fix oob read for negative tokens and memleaks on error. 2011-10-28 23:50:04 -07:00
Ronald S. Bultje
bfa0f96586 vp8: fix overflow in segmentation map caching. 2011-10-28 23:48:43 -07:00
Anton Mitrofanov
640d5f1c80 Fix decoding of lossless 4:2:2 H.264
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-10-28 23:37:30 -07:00
Anton Mitrofanov
fdb5314ea7 Fix decoding of lossless 10-bit 4:4:4 H.264
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-10-28 23:37:30 -07:00
Michael Niedermayer
6faf0a21e1 Merge remote-tracking branch 'qatar/master'
* qatar/master: (53 commits)
  probe: Restore identification of files with very large id3 tags and no extension.
  probe: Remove id3 tag presence as a criteria to do file extension checking.
  mpegts: MP4 SL support
  mpegts: MP4 OD support
  mpegts: Add support for Sections in PMT
  mpegts: Replace the MP4 descriptor parser with a recursive parser.
  mpegts: Add support for multiple mp4 descriptors
  mpegts: Parse mpeg2 SL descriptors.
  isom: Add MPEG4SYSTEMS dummy object type indication.
  aacdec: allow output reconfiguration on channel changes
  nellymoserenc: take float input samples instead of int16
  nellymoserdec: use dsp functions for overlap and windowing
  nellymoserdec: do not fail if there is extra data in the packet
  nellymoserdec: fail if output buffer is too small
  nellymoserdec: remove pointless buffer size check.
  lavf: add init_put_byte() to the list of visible symbols.
  seek-test: free options dictionary after use
  snow: do not draw_edge if emu_edge is set
  tools/pktdumper: update to recent avformat api
  seek-test: update to recent avformat api
  ...

Conflicts:
	doc/APIchanges
	libavcodec/mpegaudiodec.c
	libavcodec/nellymoserdec.c
	libavcodec/snow.c
	libavcodec/version.h
	libavcodec/wmadec.c
	libavformat/avformat.h
	libavformat/mpegts.c
	libavformat/mxfdec.c
	libavformat/utils.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-29 02:08:54 +02:00
Alex Converse
77b5c82b49 isom: Add MPEG4SYSTEMS dummy object type indication. 2011-10-28 14:54:13 -07:00
Michael Niedermayer
bc2dd36740 aacdec: allow output reconfiguration on channel changes
Locking the decoder against channel config changes in
parse_adts_frame_header() seems to be unnecessary and
streams with channel config changes are reported.

The sample in http://roundup.libav.org/issue999 still works.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2011-10-28 22:44:59 +02:00
Justin Ruggles
f3db0f7403 nellymoserenc: take float input samples instead of int16
This avoids having to convert all input data from int16 to float, which is used
internally for encoding.
2011-10-28 14:40:52 -04:00
Justin Ruggles
77c8ef9a36 nellymoserdec: use dsp functions for overlap and windowing 2011-10-28 14:40:52 -04:00
Justin Ruggles
8c9581f052 nellymoserdec: do not fail if there is extra data in the packet
instead just print a warning
2011-10-28 14:40:52 -04:00
Justin Ruggles
0aaa85dbed nellymoserdec: fail if output buffer is too small
avoids silently truncating the output
2011-10-28 14:40:52 -04:00
Justin Ruggles
f19305fe93 nellymoserdec: remove pointless buffer size check. 2011-10-28 14:40:51 -04:00
Michael Niedermayer
8fa97302e0 snow: do not draw_edge if emu_edge is set
Fix segfault on emu edge, to reproduce

make fate-vsynth1-snow
avplay -flags emu_edge tests/data/vsynth1/snow.avi

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-10-28 10:14:11 -07:00
Carl Eugen Hoyos
246c8dac3e Fix dca decoding for many samples after last commit.
Still be less verbose about channel count change from 0 channels.
2011-10-28 19:13:59 +02:00
Carl Eugen Hoyos
ad2d597292 Be less verbose about dca channel number changes.
Only inform the user that the number of channels changed if it was set
before.
2011-10-28 18:21:40 +02:00