aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-2510-45/+85
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avc: Add a function for converting mp4 style extradata to annex b pthread: free progress if buffer allocation failed. lavc/avconv: support changing frame sizes in codecs with frame mt. libavformat: Document who sets the AVStream.id field utvideo: mark output picture as keyframe. sunrast: Add support for negative linesize. vp8: fix update_lf_deltas in libavcodec/vp8.c ralf: read Huffman code lengths without GetBitContext Conflicts: ffmpeg.c libavcodec/sunrastenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avc: Add a function for converting mp4 style extradata to annex bMartin Storsjö2012-03-243-24/+42
| | | | | | | | | | | | | | Make movenc use this function instead of the current custom conversion function. Signed-off-by: Martin Storsjö <martin@martin.st>
| * pthread: free progress if buffer allocation failed.Ronald S. Bultje2012-03-241-0/+4
| | | | | | | | | | | | | | Else we run out of progress variables after a few failed buffer allocations. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * lavc/avconv: support changing frame sizes in codecs with frame mt.Ronald S. Bultje2012-03-243-13/+11
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * libavformat: Document who sets the AVStream.id fieldMartin Storsjö2012-03-241-1/+6
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * utvideo: mark output picture as keyframe.Kostya Shishkov2012-03-241-0/+2
| | | | | | | | Spotted by Антон.
| * sunrast: Add support for negative linesize.Aneesh Dogra2012-03-241-4/+7
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * vp8: fix update_lf_deltas in libavcodec/vp8.cJanne Salonen2012-03-241-4/+16
| | | | | | | | | | | | | | | | | | lf_delta.ref[i] and lf_delta.mode[i] were incorrectly reset to 0 if specific delta value was not updated. Fixed to keep the previous value if flag indicates that element in question is not updated. Signed-off-by: Janne Salonen <jsalonen@google.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * ralf: read Huffman code lengths without GetBitContextKostya Shishkov2012-03-241-4/+4
| | | | | | | | | | Those descriptions are stored in nibbles, so they are easy to extract. And this way we don't need to pad tables for possible bit reader overreads.
* | ffmpeg: drop struct from SwrContext.Michael Niedermayer2012-03-251-1/+1
| | | | | | | | | | | | Its a typdef now and doesnt need the struct anymore. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: fix compilation failure with old versions of gcc.Michael Niedermayer2012-03-251-2/+2
| | | | | | | | | | | | | | gcc 4.4 did not like the way i used typedefs Idea-by: beastd Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libaacplus: switch to encode2()Paul B Mahol2012-03-241-16/+24
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: drop SWR_CH_MAX with the next major ABI bumpMichael Niedermayer2012-03-241-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: dont use SWR_CH_MAX in the public function declaration.Michael Niedermayer2012-03-241-3/+3
| | | | | | | | | | | | | | | | This change should make no binary difference to the generated code. the API version is just bumped for correctness sake, this is not really a API or ABI change. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: make SwrContext a typedef.Michael Niedermayer2012-03-241-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample: support up to 32 channelsMichael Niedermayer2012-03-241-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | adxenc: fix error in merging from qatarPaul B Mahol2012-03-241-3/+2
| | | | | | | | | | | | | | Pointed out by FATE. Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sonic: mark as experimentalPaul B Mahol2012-03-241-1/+3
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | indeo5dec: Make sure we have had a valid gop header.Michael Niedermayer2012-03-241-1/+5
| | | | | | | | | | | | | | This prevents decoding happening on a half initialized context. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | truemotion2dec: Fix overread of input.Michael Niedermayer2012-03-241-1/+6
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cavsdec: check stc in decode_slice_header()Michael Niedermayer2012-03-241-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: move resolution change check further up.Michael Niedermayer2012-03-241-10/+15
| | | | | | | | | | | | | | | | This prevents some variables from being changed in case of a rejected resolution change. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | alsdec: check opt_order.Michael Niedermayer2012-03-241-0/+4
| | | | | | | | | | | | | | Fixes out of array write in quant_cof Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo: increase buffer sizes.Michael Niedermayer2012-03-241-2/+2
| | | | | | | | | | | | | | Fixes buffer overflow Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | indeo4: Fix global array overread.Michael Niedermayer2012-03-241-0/+4
| | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix linking without yasm.Carl Eugen Hoyos2012-03-241-4/+6
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-247-15/+60
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rv34: error out on size changes with frame threading aacsbr: Add a debug check to sbr_mapping. aac: Reset some state variables when turning SBR off aac: Reset PS parameters on header decode failure. fate: add wmalossless test. aacsbr: handle m_max values smaller than 4. Conflicts: libavcodec/aacsbr.c tests/fate/lossless-audio.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rv34: error out on size changes with frame threadingJanne Grunau2012-03-231-0/+7
| |
| * aacsbr: Add a debug check to sbr_mapping.Alex Converse2012-03-231-7/+17
| | | | | | | | | | | | | | | | There have been multiple bugs caused by inconsistencies here. Based on an idea from Michael Niedermayer. CC: libav-stable@libav.org
| * aac: Reset some state variables when turning SBR offAlex Converse2012-03-232-7/+27
| | | | | | | | | | | | | | | | This makes sure the reset flag gets set when SBR gets turned back on and sets control variables for unguided mode back to their defaults. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * aac: Reset PS parameters on header decode failure.Alex Converse2012-03-231-0/+4
| | | | | | | | | | | | | | | | If the next header frame codes zero envelopes the previous frame's values will be used. Consequently the invalid values must be cleared. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * fate: add wmalossless test.Ronald S. Bultje2012-03-232-0/+4
| |
| * aacsbr: handle m_max values smaller than 4.Ronald S. Bultje2012-03-231-0/+1
| | | | | | | | | | | | | | | | Prevents a signflip in the counter, and a subsequent crash because of overreads/overwrites. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | libopenjpegenc: switch to encode2()Paul B Mahol2012-03-241-13/+15
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libopenjpeg: make .long_name usefullPaul B Mahol2012-03-242-2/+2
| | | | | | | | | | | | | | | | | | | | Fixes following strange output: DEV D libopenjpeg OpenJPEG based JPEG 2000 encoder Signed-off-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bintext: build decoders only if they are actually enabledPaul B Mahol2012-03-241-2/+6
| | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vp56dec: avoid freeing the returned frame before returning it.Michael Niedermayer2012-03-241-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cavsdec: check for changing w/h.Michael Niedermayer2012-03-241-2/+9
| | | | | | | | | | | | | | Our decoder does not support changing w/h. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | indeo3: fix out of picture write.Michael Niedermayer2012-03-241-2/+2
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pthread/mpegvideo: detect and block attempts to init frames after setup.Michael Niedermayer2012-03-244-0/+23
| | | | | | | | | | | | | | This fixes race conditions that ultimately lead to memory corruption. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | error_concealment: Prevent FPEs in case of corrupted input.Michael Niedermayer2012-03-231-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-235-131/+175
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rv34: Handle only complete frames in frame-mt. MPV: set reference frame pointers to NULL when allocation of dummy pictures fails configure: die if x11grab dependencies are unavailable zerocodec: factorize loop avconv: fix the resampling safety factors for output audio buffer allocation avconv: move audio output buffer allocation to a separate function avconv: make the async buffer global and free it in exit_program() Conflicts: ffmpeg.c libavcodec/mpegvideo.c libavcodec/rv34.c libavcodec/zerocodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rv34: Handle only complete frames in frame-mt.Janne Grunau2012-03-231-79/+112
| | | | | | | | | | | | | | | | Correct handling of errors to prevent hags or crashes is very complex otherwise. The frame initializing is also moved from decode_slice() to decode_frame() for clarity.
| * MPV: set reference frame pointers to NULL when allocation of dummy pictures ↵Janne Grunau2012-03-231-2/+6
| | | | | | | | fails
| * configure: die if x11grab dependencies are unavailableJosh Allmann2012-03-231-8/+4
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * zerocodec: factorize loopMichael Niedermayer2012-03-231-32/+13
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * avconv: fix the resampling safety factors for output audio buffer allocationJustin Ruggles2012-03-231-1/+1
| | | | | | | | This matches the output size required for audio_resample()
| * avconv: move audio output buffer allocation to a separate functionJustin Ruggles2012-03-231-20/+32
| | | | | | | | Allows for removing a goto and makes the code easier to follow.
| * avconv: make the async buffer global and free it in exit_program()Justin Ruggles2012-03-231-5/+13
| |
* | VC1: restore optimizations broken in 9a1ced32.Reimar Döffinger2012-03-231-6/+11
| | | | | | | | | | | | | | | | They were moved into code under HAVE_YASM and most of them even into completely disabled code with no reason given for that in the commit message. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>