aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* wmapro: check the min_samples_per_subframeLuca Barbato2013-06-301-0/+7
| | | | | | | | | | Must be at least WMAPRO_BLOCK_MIN_SIZE. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit d4a217a408da4bd63acc02cd8f9ebe378a2ad65a) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* wmapro: return early on unsupported conditionLuca Barbato2013-06-301-0/+1
| | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 6652338f43ef623045912d7f28b61adea05d27ae) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/wmaprodec.c
* wmapro: check num_vec_coeffs against the actual available bufferLuca Barbato2013-06-301-3/+4
| | | | | | | | | | Prevent yet another buffer overwrite. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 38229362529ed1619d8ebcc81ecde85b23b45895) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* wmapro: make sure there is room to store the current packetLuca Barbato2013-06-301-0/+8
| | | | | | | | | | Prevent horrid and hard to trace struct overwrite. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit e30b068ef79f604ff439418da07f7e2efd01d4ea) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* lavc: move put_bits_left in put_bits.hLuca Barbato2013-06-302-5/+8
| | | | | | (cherry picked from commit afe03092dd693d025d43e1620283d8d285c92772) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* 4xm: do not overread the source buffer in decode_p_blockLuca Barbato2013-06-301-0/+8
| | | | | | | | | | Check for out of picture macroblocks before calling mcdc. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 94aefb1932be882fd93f66cf790ceb19ff575c19) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* 4xm: check bitstream_size boundary before using itLuca Barbato2013-06-301-1/+3
| | | | | | | | | | Prevent buffer overread. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 59d7bb99b6a963b7e11c637228b2203adf535eee) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* Prepare for 9.8 RELEASEReinhard Tartler2013-06-301-1/+1
|
* update ChangelogReinhard Tartler2013-06-161-0/+23
|
* smacker: check frame size validityKostya Shishkov2013-06-161-1/+5
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 07423ad7836325e03894f2f87ba46a531a1cc0b3) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* smacker: pad the extradata allocationKostya Shishkov2013-06-161-1/+2
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 4c22baf65363433f8c20efd1022b4ba2d8cf2288) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* smacker: check the return value of smacker_decode_treeKostya Shishkov2013-06-161-1/+10
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit a2f9937bb04b23a341b0ec0eb1d923bbeb420277) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* smacker: fix an off by one in huff.length computationKostya Shishkov2013-06-161-1/+1
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit ee205588b250fe5cae0681be8eba51a5403c3272) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: do not overread the prestream bufferLuca Barbato2013-06-161-2/+11
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit be373cb50d3c411366fec7eef2eb3681abe48f96) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: validate the buffer size before parsing itLuca Barbato2013-06-161-4/+17
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit de2e5777e225e75813daf2373c95e223651fd89a) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: reject frames not compatible with the declared versionLuca Barbato2013-06-161-0/+3
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 145023f57262d21474e35b4a6069cf95136339d4) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: drop pointless assertLuca Barbato2013-06-161-2/+2
| | | | | | | Make sure the value of wlog2 is always between 0 and 3. (cherry picked from commit 1f0c6075604c271d5627480f1243d22795f9a315) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: forward errors from decode_p_blockLuca Barbato2013-06-161-12/+22
| | | | | | | | | | Partially mitigate out of memory writes. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit b8b809908ec547b2609dbac24194f4fd2df61aea) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: fold last_picture lazy allocation in decode_p_frameLuca Barbato2013-06-161-8/+10
| | | | | | | | | (cherry picked from commit 50ec1db62d977b6e864f315a53c1c580a6d7efa4) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/4xm.c
* 4xm: do not overread while parsing headerLuca Barbato2013-06-161-6/+14
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 42d73f7f6bea0ee0f64a3ad4882860ce5b923a11) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: refactor fourxm_read_headerLuca Barbato2013-06-161-89/+101
| | | | | | | | | | Split sound and video tag parsing in separate functions. (cherry picked from commit e7a44f87d07655ec0cd31c315936931674434340) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/4xm.c
* 4xm: K&R formatting cosmeticsLuca Barbato2013-06-161-44/+41
| | | | | | (cherry picked from commit e6496ea7e7ea7355167a1ccbe67a7199d446a654) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: use the correct logging contextLuca Barbato2013-06-161-2/+2
| | | | | | (cherry picked from commit 08859d19b429c522d6494c186656f4a2d3ff8e21) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* tiff: do not overread the source bufferLuca Barbato2013-06-081-1/+4
| | | | | | | | | | | | | At least 2 bytes from the source are read every loop. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 9c2216976907336dfae0e8e38a4d70ca2465a92c) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/tiff.c
* apetag: use int64_t for filesizeAnton Khirnov2013-06-081-1/+1
| | | | | | | CC: libav-stable@libav.org (cherry picked from commit e816aaacd68201b67182f9c70dc680e89a0123e9) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* vmd: refactor the inner decode loopLuca Barbato2013-06-011-78/+82
| | | | | | | | | | | | | | | Simplify a little, assume empty frames are acceptable and do not pointlessly reinit the bytestream2 contexts using possibly wrong size values. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 676da248cad49debc40720baa13214f0b94dcc71) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/vmdav.c
* vmd: use the PALETTE_COUNT constant uniformlyLuca Barbato2013-06-011-1/+1
| | | | | | | While at it drop useless parentheses. (cherry picked from commit 91a6944e56236234f0a7ba162404665753cbcb51) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* vmd: drop incomplete chunks and spurious samplesLuca Barbato2013-05-311-2/+6
| | | | | | | | | | | Odd chunk size makes no sense for stereo and incomplete chunks are not supported. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 701966730ce10290fd49c5ccedd73f505680f764) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* vmd: return meaningful errorsLuca Barbato2013-05-311-11/+24
| | | | | | | | | | CC: libav-stable@libav.org (cherry picked from commit c8f3cb9119c2183680d44a509a1b5a9817a3bee9) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/vmdav.c
* vmdav: convert to bytestream2Alexandra Khirnova2013-05-311-93/+59
| | | | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 0afcf97e1ece51d29bb791698b00cd1b7ba97dcf) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/vmdav.c
* wavpack: use bytestream2 in wavpack_decode_blockLuca Barbato2013-05-311-83/+106
| | | | | | | | | | | | | Prevent most out of buffer reads. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 3f0b6d7a6248a33df37b98cfcb37a1acce263f62) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/wavpack.c
* wavpack: return meaningful errorsLuca Barbato2013-05-311-19/+20
| | | | | | | | | | And forward those that were already meaningful. (cherry picked from commit 8c34558131d846d2b10389564caadaa206372fd4) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/wavpack.c
* wavpack: check packet size earlyLuca Barbato2013-05-311-0/+3
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit fd06291239c1bb616bf303b5696cc432710b2530) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* pixdesc: mark gray8 as pseudopalAnton Khirnov2013-05-311-0/+1
| | | | | | | | | | Many functions treat it as such already. Fixes Bug 499. CC:libav-stable@libav.org (cherry picked from commit f36d7831d96aeb072db5a2b78892a534d96e288e) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* mjpegdec: validate parameters in mjpeg_decode_scan_progressive_acLuca Barbato2013-05-311-0/+5
| | | | | | | | | | Prevent out of buffer write when decoding broken samples. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit cfbd98abe82cfcb9984a18d08697251b72b110c8) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* mjpeg: Validate sampling factorsLuca Barbato2013-05-311-0/+7
| | | | | | | | | | They must be non-zero. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 8aa3500905fec6c4e657bb291b861d43c34d3de9) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* ljpeg: use the correct number of components in yuvLuca Barbato2013-05-311-3/+3
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit a030279a67ef883df8cf3707774656fa1be81078) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* wavpack: validate samples size parsed in wavpack_decode_blockLuca Barbato2013-05-311-0/+3
| | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit ed50673066956d6f2201a57c3254569f2ab08d9d) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/wavpack.c
* jpegls: check the scan offsetLuca Barbato2013-05-311-0/+4
| | | | | | | | | | | | | Prevent an out of array bound write. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit abad374909e6416e941351094f4f1446a71f8d23) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/jpeglsdec.c
* jpegls: factorize return pathsReinhard Tartler2013-05-311-5/+6
| | | | | | | Conflicts: libavcodec/jpeglsdec.c (cherry picked from commit 4a4107b48944397c914aa39ee16a82fe44db8c4c)
* jpegls: return meaningful errorsLuca Barbato2013-05-311-5/+5
| | | | | | | | | (cherry picked from commit a5a0ef5e13a59ff53318a45d77c5624b23229c6f) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/jpeglsdec.c
* mpegvideo: allocate sufficiently large scratch buffer for interlaced vidJindrich Makovicka2013-05-311-1/+1
| | | | | | | | | | | | | | | | | | | MPV_decode_mb_internal needs 3 * 16 * linesize bytes of scratch buffer For interlaced content, linesize is multiplied by two after the allocation of the scratch buffer, and the dest_cr pointer ends past the buffer. This patch makes ff_mpv_frame_size_alloc allocate a total of (aligned line_size) * 2 * 16 * 3 bytes, which suffices even for the interlaced case. CC:libav-stable@libav.org Signed-off-by: Jindrich Makovicka <makovick@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 259af1b92370b32f6d0b9a6de314db4b44c2481d) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* mjpegdec: properly report unsupported disabled featuresLuca Barbato2013-05-311-0/+6
| | | | | | | | | | | When JPEG-LS support is disabled the decoder would feed the data to the JPEG Lossless decode_*_scan function resulting in faulty decoding. CC: libav-stable@libav.org (cherry picked from commit b25e49b187617c486ae3f50a5cbb356fc0e868bb) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* Prepare for 9.7 ReleaseReinhard Tartler2013-05-311-1/+1
|
* update ChangelogReinhard Tartler2013-05-121-0/+1
|
* proresdec: support mixed interlaced/non-interlaced contentMichael Smith2013-05-121-0/+2
| | | | | | | | | Set interlaced to false if we don't have an interlaced frame Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 0881cbf314982cce8448bd12644ce2a6e0b8c576) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* update ChangelogReinhard Tartler2013-05-111-0/+13
|
* af_asyncts: fix offset calculationAnton Khirnov2013-05-111-4/+9
| | | | | | | | | | delta is in samples, not bytes. Also the sample format is not guaranteed to be planar. CC:libav-stable@libav.org (cherry picked from commit 16a4a18db089af8c432f1cdec62155000585b72c) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* oma: properly forward errors in oma_read_packetLuca Barbato2013-05-111-2/+4
| | | | | | | | | Prevent spurios EIO on EOF. CC:libav-stable@libav.org (cherry picked from commit db9aee6ccf183508835acc325f5ad87d595eacc4) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* indeo3: use unaligned reads on reference blocks.Anton Khirnov2013-05-111-20/+20
| | | | | | | | | | They are not guaranteed to be aligned. Fixes Bug 503. CC:libav-stable@libav.org (cherry picked from commit a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8) Signed-off-by: Reinhard Tartler <siretart@tauware.de>