summaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* skip_bits: dont call UPDATE_CACHEMichael Niedermayer2013-09-301-1/+0
| | | | | | UPDATE_CACHE isnt needed and can cause segfaults Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f'Michael Niedermayer2013-09-301-2/+4
|\ | | | | | | | | | | | | | | | | | | * commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f': pcx: Return an error on broken palette if err_detect is set to 'explode' Conflicts: libavcodec/pcx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pcx: Return an error on broken palette if err_detect is set to 'explode'Martin Storsjö2013-09-291-2/+4
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547'Michael Niedermayer2013-09-301-0/+6
|\ \ | |/ | | | | | | | | | | * commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547': pcx: Check the packet size before assuming it fits a palette Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pcx: Check the packet size before assuming it fits a paletteMartin Storsjö2013-09-291-0/+6
| | | | | | | | | | | | | | | | This fixes reads out of bounds. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6'Michael Niedermayer2013-09-301-1/+1
|\ \ | |/ | | | | | | | | | | * commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6': rpza: Fix a buffer size check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rpza: Fix a buffer size checkMartin Storsjö2013-09-291-1/+1
| | | | | | | | | | | | | | | | | | We read 2 bytes for 15 out of 16 pixels, therefore we need to have at least 30 bytes, not 16. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc'Michael Niedermayer2013-09-301-6/+7
|\ \ | |/ | | | | | | | | | | | | | | * commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc': xxan: Disallow odd width See: 77693c541a541661357a0edd5bbaae69c64b2039 See: 8ad9b48c9b5b749df8fbcd59d61278caadc478ca Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xxan: Disallow odd widthMartin Storsjö2013-09-291-0/+4
| | | | | | | | | | | | | | | | | | Decoded data is always written in pairs within this decoder. This fixes writes out of bounds. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82'Michael Niedermayer2013-09-301-5/+7
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82': xan: Only read within the data that actually was initialized Conflicts: libavcodec/xan.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xan: Only read within the data that actually was initializedMartin Storsjö2013-09-291-5/+7
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '30db94dc399f6e4ef8905049d9b740556f0fce47'Michael Niedermayer2013-09-301-17/+15
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '30db94dc399f6e4ef8905049d9b740556f0fce47': xan: Use bytestream2 to limit reading to within the buffer Conflicts: libavcodec/xan.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xan: Use bytestream2 to limit reading to within the bufferMartin Storsjö2013-09-291-12/+10
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887'Michael Niedermayer2013-09-301-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887': pcx: Consume the whole packet if giving up due to missing palette Conflicts: libavcodec/pcx.c See: b4e516e30e7004a0454a9009080c4de38987189a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pcx: Consume the whole packet if giving up due to missing paletteMartin Storsjö2013-09-291-0/+1
| | | | | | | | | | | | | | | | | | Previously, we returned 0, meaning successful decoding but 0 bytes consumed, leading to an infinite loop. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7'Michael Niedermayer2013-09-301-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7': pngdec: Stop trying to decode once inflate returns Z_STREAM_END Conflicts: libavcodec/pngdec.c See: 65bf9a44d7b0295e03463fd143499ab5b85d0cb7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pngdec: Stop trying to decode once inflate returns Z_STREAM_ENDMartin Storsjö2013-09-291-0/+4
| | | | | | | | | | | | | | | | | | | | If the input buffer contains more data after the deflate stream, the loop previously left running infinitely, with inflate returning Z_STREAM_END. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '59480abce7e4238e22b3a4a904a9fe6abf4e4188'Michael Niedermayer2013-09-291-0/+3
|\ \ | |/ | | | | | | | | | | | | * commit '59480abce7e4238e22b3a4a904a9fe6abf4e4188': alac: Do bounds checking of lpc_order read from the bitstream See: fd4f4923cce6a2cbf4f48640b4ac706e614a1594 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * alac: Do bounds checking of lpc_order read from the bitstreamMartin Storsjö2013-09-291-0/+3
| | | | | | | | | | | | | | | | | | In lpc_prediction(), we write up to array element 'lpc_order' in an array allocated to hold 'max_samples_per_frame' elements. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/tiff_common: fix bprint max sizesMichael Niedermayer2013-09-291-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/exif: print bytes and undefined types as scalar listsMichael Niedermayer2013-09-291-1/+1
| | | | | | | | | | | | This prevents odd characters from ending in the fate test Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff_common: add ff_tadd_bytes_metadata()Michael Niedermayer2013-09-292-0/+37
| | | | | | | | | | | | | | The le argument is passed so the function has the same prototype as the other similar functions. It is otherwise unused Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Rewrite emu_edge functions to have separate src/dst_stride arguments.Ronald S. Bultje2013-09-2820-674/+657
| | | | | | | | | | | | This allows supporting files for which the image stride is smaller than the max. block size + number of subpel mc taps, e.g. a 64x64 VP9 file or a 16x16 VP8 file with -fflags +emu_edge.
* | vp8: use 2 registers for dst_stride and src_stride in neon bilin filter.Ronald S. Bultje2013-09-281-78/+87
| |
* | avcodec/huffman: Allow specifying nb_bits to ff_huff_build_tree()Michael Niedermayer2013-09-284-7/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libopenjpeg: fix encoding of odd sized subsampled imagesMichael Bradshaw2013-09-281-17/+62
| | | | | | | | | | Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Convert multiplier for MV from int to ptrdiff_t.Ronald S. Bultje2013-09-2817-31/+32
| | | | | | | | | | | | | | This prevents emulated_edge_mc from not undoing mvy*stride-related integer overflows. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/imc: Check flcoeffs5Michael Niedermayer2013-09-271-1/+6
| | | | | | | | | | | | | | Fixes infinite loop Fixes Ticket2996 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mlpdec: Fail if the input is too smallMichael Niedermayer2013-09-271-1/+1
| | | | | | | | | | | | | | This fixes a infinite loop Fixes Ticket2986 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7e52080cb18332cb1da9fe133498750b6b4b0fb3'Michael Niedermayer2013-09-273-1/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e52080cb18332cb1da9fe133498750b6b4b0fb3': pcm: support 24-bit/32-bit little-endian planar Conflicts: doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/pcm.c libavcodec/version.h libavformat/nut.c See: 467dfd5dfae7cc435a2b2e7cf012a0de2fea5848 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pcm: support 24-bit/32-bit little-endian planarPaul B Mahol2013-09-277-15/+56
| | | | | | | | | | | | Used by LXF. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * g2meet: Respect cursor_stride properly everywhereKostya Shishkov2013-09-251-0/+3
| | | | | | | | | | | | This fixes a regression with rgb cursors since b1e46988. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/parser: reset indexes on realloc failureMichael Niedermayer2013-09-261-3/+7
| | | | | | | | | | | | Fixes Ticket2982 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/wmalosslessdec: Fix return code for invalid buffer sizesMichael Niedermayer2013-09-251-2/+4
| | | | | | | | | | | | | | Fixes infinite loop Fixes Ticket2979 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/flicvideo: fix infinite loopsPaul B Mahol2013-09-251-2/+4
| | | | | | | | | | | | 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-251-0/+3
| | | | | | | | | | | | | | | | | | decode_subframe_length() Fixes infinite loop Fixes Ticket2987 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/lagarith: check scaled probabilitiesMichael Niedermayer2013-09-251-1/+9
| | | | | | | | | | | | | | Prevents infinite loop Fixes Ticket2988 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cabac: remove h264_lps_stateMichael Niedermayer2013-09-251-7/+1
| | | | | | | | | | | | | | 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-251-5/+11
|\ \ | |/ | | | | | | | | | | * 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-241-5/+11
| |
* | Merge commit 'cab8c5f8e140c96ba3725ab709d823abfd1e31a5'Michael Niedermayer2013-09-252-1/+8
|\ \ | |/ | | | | | | | | | | | | * 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-242-1/+8
| |
* | Merge commit 'e880418660c80e2f12a123e131975cdb6b12cd13'Michael Niedermayer2013-09-251-7/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-241-6/+2
| |
| * lavc: add support for interleaved chroma formats to libx264.Kieran Kunhya2013-09-241-0/+6
| | | | | | | | | | | | 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-251-0/+2
| | | | | | | | | | | | | | Fix infinite loop Fix Ticket2978 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo_enc: check qmin/qmaxMichael Niedermayer2013-09-251-0/+5
| | | | | | | | | | | | Fixes Ticket2990 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/g2meet: fix regression with rgb cursorsMichael Niedermayer2013-09-251-1/+1
| | | | | | | | | | | | Fixes Ticket2972 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: drop emu edge check from chroma_4mv_motion_lowres()Michael Niedermayer2013-09-241-8/+6
| | | | | | | | | | | | This is in line with the other functions Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a454dec19aa6666b555deec431bc42eda391d7b6'Michael Niedermayer2013-09-241-1/+2
|\ \ | |/ | | | | | | | | | | | | * commit 'a454dec19aa6666b555deec431bc42eda391d7b6': pixdesc: fix NV20* descriptors h264_sei: check SEI size Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud