summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* avcodec/parser: reset indexes on realloc failureMichael Niedermayer2013-09-26
| | | | | | Fixes Ticket2982 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/wmalosslessdec: Fix return code for invalid buffer sizesMichael Niedermayer2013-09-25
| | | | | | | Fixes infinite loop Fixes Ticket2979 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/flicvideo: fix infinite loopsPaul B Mahol2013-09-25
| | | | | | Fixes #2995. Reported-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/wmaprodec: check that there are input bits left in ↵Michael Niedermayer2013-09-25
| | | | | | | | | decode_subframe_length() Fixes infinite loop Fixes Ticket2987 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/lagarith: check scaled probabilitiesMichael Niedermayer2013-09-25
| | | | | | | Prevents infinite loop Fixes Ticket2988 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/cabac: remove h264_lps_stateMichael Niedermayer2013-09-25
| | | | | | | The only use case of it was the selftest code, and there the slightly more complex indexing that is needed after its removial doesnt matter. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-25
|\ | | | | | | | | | | | | * qatar/master: lavc doxy: document that avcodec_flush_buffers() invalidates decoded frames Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc doxy: document that avcodec_flush_buffers() invalidates decoded framesAnton Khirnov2013-09-24
| |
* | Merge commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5'Michael Niedermayer2013-09-25
|\| | | | | | | | | | | | | | | * commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5': h264: do not reinitialize the global cabac tables at each slice header See: 1e2e2c8095de2d9ea3259305cfeff28f40e4ca12 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: do not reinitialize the global cabac tables at each slice headerAnton Khirnov2013-09-24
| |
* | Merge commit 'e880418660c80e2f12a123e131975cdb6b12cd13'Michael Niedermayer2013-09-25
|\| | | | | | | | | | | | | | | | | | | * commit 'e880418660c80e2f12a123e131975cdb6b12cd13': cabac: remove write-only h264_mps_state[] Conflicts: libavcodec/cabac.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cabac: remove write-only h264_mps_state[]Anton Khirnov2013-09-24
| |
| * lavc: add support for interleaved chroma formats to libx264.Kieran Kunhya2013-09-24
| | | | | | | | | | | | Interleaved chroma is x264's native format Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/pngdec: check for stream end in png_decode_idat()Michael Niedermayer2013-09-25
| | | | | | | | | | | | | | Fix infinite loop Fix Ticket2978 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo_enc: check qmin/qmaxMichael Niedermayer2013-09-25
| | | | | | | | | | | | Fixes Ticket2990 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/g2meet: fix regression with rgb cursorsMichael Niedermayer2013-09-25
| | | | | | | | | | | | Fixes Ticket2972 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: drop emu edge check from chroma_4mv_motion_lowres()Michael Niedermayer2013-09-24
| | | | | | | | | | | | This is in line with the other functions Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a454dec19aa6666b555deec431bc42eda391d7b6'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | * commit 'a454dec19aa6666b555deec431bc42eda391d7b6': pixdesc: fix NV20* descriptors h264_sei: check SEI size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_sei: check SEI sizeMichael Niedermayer2013-09-24
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | | | | | | | * commit '71cabb521ac397db3903011d2de7afd3e0fc7ab6': h264: do not discard NAL_SEI when skipping frames Conflicts: libavcodec/h264.c See: 7d75fb381ba774a8d2fa7de0c12140cd465c0255 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: do not discard NAL_SEI when skipping framesRainer Hochecker2013-09-24
| | | | | | | | | | | | Setting AVDISCARD_NONREF (e.g. after flushing) resulted in 100% dropped frames. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'edaba18021e4793116f0f266e65077578a5e742e'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | | | | | * commit 'edaba18021e4793116f0f266e65077578a5e742e': h264: log extradata skip only for non-ignored NALs Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: log extradata skip only for non-ignored NALsVittorio Giovara2013-09-24
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '26179964ff3fa1173e6f512c5735ba8223e2395d'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | | | | | * commit '26179964ff3fa1173e6f512c5735ba8223e2395d': h264_sei: log unknown sei messages Conflicts: libavcodec/h264_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_sei: log unknown sei messagesVittorio Giovara2013-09-24
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d': mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0 Conflicts: libavcodec/mpegvideo.c The chroma_*_shift and codec_tag code was not under a size!=0 check in ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0Martin Storsjö2013-09-24
| | | | | | | | | | | | | | | | | | | | | | | | This fixes breakage in a few fate tests on certain setups (that for some reason didn't break on OS X) after the previous commit (8812a8057). Currently, some video streams are initialized in ff_MPV_common_init with width/height set at 0 and only changed to a proper video size with ff_MPV_common_frame_size_change later. The breakage was diagnosed by Anton Khirnov. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-24
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: h263dec: Remove a hack that can cause infinite loops Conflicts: libavcodec/h263dec.c See: d2981b8ef191fc7876e3486e42222ab6a8777c24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263dec: Remove a hack that can cause infinite loopsMartin Storsjö2013-09-23
| | | | | | | | | | | | | | | | The actual usefulness of the hack is not known, and it does cause infinite loops with some broken input files. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/mjpegenc: dont store DQT for LJPEGMichael Niedermayer2013-09-24
| | | | | | | | | | | | | | This may improve compatibility of lgpegs generated by libavcodec also encoded ljpegs become slightly smaller Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vp8: fix PPC assembly and bilinear C code to work if src_stride != dst_stride.Ronald S. Bultje2013-09-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vc1dec: fix propagating error codes from various functionsMichael Niedermayer2013-09-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vc1dec: Fix return code on malloc() failure from ↵Michael Niedermayer2013-09-23
| | | | | | | | | | | | ff_vc1_decode_init_alloc_tables() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9': vc1dec: Check the error handling flags on slice/field header decode errors Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Check the error handling flags on slice/field header decode errorsMartin Storsjö2013-09-22
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | | | | | | | * commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd': vc1dec: Don't decode slices when the latest slice header failed to decode Conflicts: libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Don't decode slices when the latest slice header failed to decodeMichael Niedermayer2013-09-22
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5e25fdbfe01635cfc650ac4adc27d434b2df0d64'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | | | * commit '5e25fdbfe01635cfc650ac4adc27d434b2df0d64': vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks See: 09de0ffeab37442d1a31ee194ea6d78a67186de1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocksMartin Storsjö2013-09-22
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a': vc1dec: Undo mpegvideo initialization if unable to allocate tables Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Undo mpegvideo initialization if unable to allocate tablesMartin Storsjö2013-09-22
| | | | | | | | | | | | | | | | | | | | Previously, s->context_initialized was left set to 1 if ff_vc1_decode_init_alloc_tables failed, skipping the initialization completely on the next decode call. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3': vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errorsMartin Storsjö2013-09-22
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | | | | | | | | | * commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8': wnv1: Make sure the input packet is large enough Conflicts: libavcodec/wnv1.c See: f23a2418fb0ccc56fdae4dbf83a5994cc917c475 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wnv1: Make sure the input packet is large enoughMartin Storsjö2013-09-22
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
| * h264: remove an unused static constantVittorio Giovara2013-09-20
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | libopenjpeg: init and close properly; don't config during encodeMichael Bradshaw2013-09-23
| | | | | | | | | | Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/escape124: fix infinite loopPaul B Mahol2013-09-23
| | | | | | | | | | | | | | | | | | Remove can_safely_read() as its not really needed with checked bitstream reader. Fixes #2984. Reported-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/avcodec.h: skip_alpha should not be accessed directly (would cause ↵Michael Niedermayer2013-09-22
| | | | | | | | | | | | ABI issues) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: Add support for interleaved chroma formats to libx264. Interleaved ↵Kieran Kunhya2013-09-22
| | | | | | | | | | | | chroma is x264's native format Signed-off-by: Michael Niedermayer <michaelni@gmx.at>