| 1017b59 | Michael Niedermayer | 13 January 2014, 14:20:18 UTC | update for 1.1.8 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 13 January 2014, 14:20:18 UTC |
| 9f47f95 | Michael Niedermayer | 13 January 2014, 14:09:10 UTC | Merge remote-tracking branch 'qatar/release/9' into release/1.1 * qatar/release/9: prores: Error out only on surely incomplete ac_coeffs Merged-by: Michael Niedermayer <michaelni@gmx.at> | 13 January 2014, 14:14:13 UTC |
| 9aa2291 | Luca Barbato | 10 October 2013, 08:26:31 UTC | prores: Error out only on surely incomplete ac_coeffs (cherry picked from commit 2df7f7714a12a59d31058aba15fb1e348e36b0ab) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 13 January 2014, 13:18:37 UTC |
| 9b89824 | Michael Niedermayer | 12 January 2014, 15:57:57 UTC | Merge remote-tracking branch 'qatar/release/9' into release/1.1 * qatar/release/9: shorten: Fix out-of-array read Merged-by: Michael Niedermayer <michaelni@gmx.at> | 12 January 2014, 16:06:54 UTC |
| f479c17 | Michael Niedermayer | 12 January 2014, 15:51:26 UTC | Merge commit '65830277d2d2ee3658e1f070a61044fff261ed3e' into release/1.1 * commit '65830277d2d2ee3658e1f070a61044fff261ed3e': prores: Add a codepath for decoding errors nut: Fix unchecked allocations avi: directly resync on DV in AVI read failure mov: Don't allocate arrays with av_malloc that will be realloced shorten: Extend fixed_coeffs to properly support pred_order 0 Prepare for 9.11 RELEASE avi: properly fail if the dv demuxer is missing prores: Reject negative run and level values audio_mix: fix channel order in mix_1_to_2_fltp_flt_c indeo4: Check the inherited quant_mat Conflicts: RELEASE libavcodec/indeo4.c libavcodec/shorten.c libavformat/nut.c libavformat/nutdec.c libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 12 January 2014, 15:51:26 UTC |
| 1203e92 | Michael Niedermayer | 12 January 2014, 15:37:42 UTC | Merge commit '0358a099f8abe60230dc2e5bec59bfceb7d1be07' into release/1.1 * commit '0358a099f8abe60230dc2e5bec59bfceb7d1be07': indeo4: Check the block size if reusing the band configuration ffv1: Assume bitdepth 0 means 8bit alsa-audio-dec: explicitly cast the delay to a signed int64 matroskadec: pad EBML_BIN data. motionpixels: clip VLC codes. avidec: fix a memleak in the dv init code. Conflicts: libavcodec/ffv1dec.c libavcodec/indeo4.c libavdevice/alsa-audio-dec.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 12 January 2014, 15:37:42 UTC |
| c693ccb | Michael Niedermayer | 12 January 2014, 15:16:58 UTC | Merge commit '7b337b122959b9bf634c31b549892df974f35b40' into release/1.1 * commit '7b337b122959b9bf634c31b549892df974f35b40': truemotion1: make sure index does not go out of bounds pcx: round up in bits->bytes conversion in a buffer size check omadec: Fix wrong number of array elements omadec: check GEOB sizes against buffer size ac3dec: fix outptr increment. avio: Use AVERROR_PROTOCOL_NOT_FOUND Conflicts: libavcodec/ac3dec.c libavcodec/pcx.c libavformat/omadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 12 January 2014, 15:16:58 UTC |
| 7e34379 | Michael Niedermayer | 12 January 2014, 15:01:50 UTC | Merge commit '0e8ae6d10c609bb968c141aa2436413a55852590' into release/1.1 * commit '0e8ae6d10c609bb968c141aa2436413a55852590': mpegvideo: Drop a faulty assert lavr: check that current_buffer is not NULL before using it pmpdec: check that there is at least one audio packet. lzw: switch to bytestream2 gifdec: convert to bytestream2 Conflicts: libavcodec/gifdec.c libavcodec/lzw.c libavcodec/lzw.h libavformat/pmpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 12 January 2014, 15:08:27 UTC |
| ce795ac | Michael Niedermayer | 12 January 2014, 14:48:39 UTC | Merge commit 'c5c7e3e6f7cf17943c04bd078f260eaf789afbc9' into release/1.1 * commit 'c5c7e3e6f7cf17943c04bd078f260eaf789afbc9': gifdec: check that the image dimensions are non-zero gifdec: return meaningful error codes. eacmv: check the framerate before setting it. rv30: fix extradata size check. sdp: Check that fmt->oformat is non-null before accessing it matroskadec: use correct compression parameters for current track CodecPrivate vc1: Reset numref if fieldmode is not set Conflicts: libavcodec/gifdec.c libavcodec/rv30.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 12 January 2014, 14:48:39 UTC |
| 5ea2a8d | Michael Niedermayer | 09 January 2014, 03:02:58 UTC | avcodec/msvideo1enc: fix SKIPS_MAX Fixes Ticket3270 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fb8f5d0510619cea2204246631f1c0dcd994ee25) | 09 January 2014, 10:52:48 UTC |
| 3ada932 | Carl Eugen Hoyos | 07 January 2014, 21:49:05 UTC | Use the h264 parser when decoding VSSH in avi. Fixes ticket #3261 visually. Analyzed-by: Michael Doilnitsyn (cherry picked from commit 94cf4f8bac12c58e30ce3b5d72cf5898baafe9a8) Conflicts: libavformat/avidec.c | 09 January 2014, 10:52:19 UTC |
| adb784a | Michael Niedermayer | 08 January 2014, 03:49:50 UTC | avformat/mxfdec: detect loops during header parsing The header parser uses forward and backward parsing, making the bulletproof prevention of loops difficult, thus this simple detection code. If someone improves the forward/backward parsing so it cannot loop then this commit should be reverted Fixes Ticket3278 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1c010fd035c1a14dc73827b84f21f593e969a5d6) | 09 January 2014, 10:51:32 UTC |
| 4de4eb6 | Michael Niedermayer | 04 January 2014, 16:33:59 UTC | avformat/oggdec: dont read timestamps from EOS pages of ogm videos Some muxers store invalid timestamps there, which breaks seeking Fixes Ticket2739 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5e0c7eab2a9d43e6e3be967ec1a6b04a3e0328da) | 09 January 2014, 10:50:29 UTC |
| a0866c7 | Tim Walker | 09 October 2013, 09:47:04 UTC | shorten: Fix out-of-array read pred_order == FF_ARRAY_ELEMS(fixed_coeffs) is invalid too. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 5f5ada3dbf97e306a74250ba8dcf8619ad59b020) Signed-off-by: Tim Walker <tdskywalker@gmail.com> | 06 January 2014, 15:36:56 UTC |
| 6583027 | Luca Barbato | 10 October 2013, 06:40:39 UTC | prores: Add a codepath for decoding errors (cherry picked from commit 44690dfa683f620c77e9f0e8e9bc5682608636b1) Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> | 06 January 2014, 02:31:17 UTC |
| 5ae7ed3 | Derek Buitenhuis | 22 October 2013, 15:11:11 UTC | nut: Fix unchecked allocations CC: libav-stable@libav.org (cherry picked from commit b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4) Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> | 06 January 2014, 02:31:05 UTC |
| 61057f4 | Luca Barbato | 06 August 2013, 01:52:48 UTC | avi: directly resync on DV in AVI read failure Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit ceec6e792e4b5baaa23b220f4fd33417631f5288) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:34:06 UTC |
| d149c14 | Martin Storsjö | 04 October 2013, 06:52:02 UTC | mov: Don't allocate arrays with av_malloc that will be realloced CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit b698542ad83284fbb8c22404e3cafeb2dd739d38) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:31:06 UTC |
| 5bbee02 | Luca Barbato | 04 September 2013, 17:26:36 UTC | shorten: Extend fixed_coeffs to properly support pred_order 0 Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit b2148faca9e9e553c14b27844b56e367c85a777e) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:30:53 UTC |
| f53a533 | Reinhard Tartler | 05 January 2014, 22:23:12 UTC | Prepare for 9.11 RELEASE | 05 January 2014, 22:23:12 UTC |
| e361fde | Luca Barbato | 05 August 2013, 23:39:07 UTC | avi: properly fail if the dv demuxer is missing CC: libav-stable@libav.org (cherry picked from commit 1cac9accbd1f9b8596122d0735e37b97a844c514) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:21:47 UTC |
| 1d7a453 | Luca Barbato | 10 October 2013, 19:02:10 UTC | prores: Reject negative run and level values Sample-Id: 00000611-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit c0de9a23c7080e2fac8f879b9d9a0ce2b64ea953) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:21:35 UTC |
| 481e55e | Anton Khirnov | 02 October 2013, 14:40:02 UTC | audio_mix: fix channel order in mix_1_to_2_fltp_flt_c CC:libav-stable@libav.org (cherry picked from commit df6737a55f5dc7c0ae5272bc5fa6182836d5481c) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:21:24 UTC |
| 03457ca | Luca Barbato | 11 October 2013, 09:34:03 UTC | indeo4: Check the inherited quant_mat Invalidate it if not supported. Sample-Id: 00000262-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit c9ef6b09326a24010bf86d6b0d19cfa42df4d546) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/indeo4.c | 05 January 2014, 22:21:07 UTC |
| 0358a09 | Luca Barbato | 11 October 2013, 08:51:53 UTC | indeo4: Check the block size if reusing the band configuration Sample-Id: 00000287-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 0cb83c563848bf8f8365e7bd30e7e6b57ef360f0) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:16:42 UTC |
| 2656036 | Luca Barbato | 13 October 2013, 13:34:47 UTC | ffv1: Assume bitdepth 0 means 8bit CC: libav-stable@libav.org Reported-by: debian/726189 (cherry picked from commit a90905db2e6ab1840890f3a88bfd3bf008b9d886) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:15:41 UTC |
| f9f2591 | Anton Khirnov | 01 December 2013, 08:27:01 UTC | alsa-audio-dec: explicitly cast the delay to a signed int64 Otherwise the expression will be evaluated as unsigned, which will break when the result should be negative. CC:libav-stable@libav.org (cherry picked from commit 089fac77a6bf9199a5ec161e9c27850f0a680541) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:15:04 UTC |
| cbf51c4 | Anton Khirnov | 15 November 2013, 09:15:24 UTC | matroskadec: pad EBML_BIN data. It might be passed to code requiring padding, such as lzo decompression. Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org (cherry picked from commit 30be1ea33e5525266ad871bed60b1893a53caeaf) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:13:19 UTC |
| 26221a5 | Anton Khirnov | 15 November 2013, 14:33:20 UTC | motionpixels: clip VLC codes. Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org (cherry picked from commit ca41c72c6d9515d9045bd3b68104525dee81b8d0) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:13:08 UTC |
| 7c214e3 | Anton Khirnov | 15 November 2013, 18:06:23 UTC | avidec: fix a memleak in the dv init code. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org (cherry picked from commit ce9bba5340a5fb6f38974a19af019dd6aa2da035) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:12:52 UTC |
| 7b337b1 | Anton Khirnov | 15 November 2013, 18:06:23 UTC | truemotion1: make sure index does not go out of bounds Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org (cherry picked from commit c918e08b9cc9ce8d06159c51da55ec5ab018039a) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:12:39 UTC |
| 51ff116 | Anton Khirnov | 15 November 2013, 18:06:23 UTC | pcx: round up in bits->bytes conversion in a buffer size check Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org (cherry picked from commit 430d12196432ded13f011a3bf7690f03c9b2e5d6) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:12:31 UTC |
| 35f9a08 | Michael Niedermayer | 24 October 2013, 13:24:24 UTC | omadec: Fix wrong number of array elements Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: David Goldwich <david.goldwich@gmail.com> CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 97f50e92b5cf3b47a76f75d76ed4340e822030db) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:12:19 UTC |
| cdc47c4 | Michael Niedermayer | 24 October 2013, 13:24:25 UTC | omadec: check GEOB sizes against buffer size Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: David Goldwich <david.goldwich@gmail.com> CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 1c736bedd9891501960ebac0f7c05eb60225e947) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:12:06 UTC |
| e776a1e | Michael Niedermayer | 25 October 2013, 22:46:53 UTC | ac3dec: fix outptr increment. Fixes corrupt data errors when downmixing in the AC-3 decoder. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> CC:libav-stable@libav.org (cherry picked from commit 6c82c87dbbc0582658968eae46cfebeea90a9c5e) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:11:54 UTC |
| d6d2617 | Luca Barbato | 20 October 2013, 20:01:54 UTC | avio: Use AVERROR_PROTOCOL_NOT_FOUND When the protocol is missing ffurl_alloc() should return AVERROR_PROTOCOL_NOT_FOUND instead of AVERROR(ENOENT). Bug-Id: 577 CC: libav-stable@libav.org (cherry picked from commit ea71aafd6881d7ce5cffec56feb45488e3ac5221) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:08:19 UTC |
| 0e8ae6d | Luca Barbato | 22 October 2013, 17:17:10 UTC | mpegvideo: Drop a faulty assert That check is easily reachable by faulty input. CC:libav-stable@libav.org Reported-by: Torsten Sadowski <tsadowski@gmx.net> (cherry picked from commit 72072bf9de3241848ea86f68d2297b7a5d6ad49b) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:08:03 UTC |
| 24a8dfd | Justin Ruggles | 27 October 2013, 19:00:36 UTC | lavr: check that current_buffer is not NULL before using it Fixes a segfault during resampling when compiled with -DDEBUG. Fixes all fate-lavr-resample tests with -DDEBUG. CC:libav-stable@libav.org (cherry picked from commit 211ca69b13eb0a127a9ef7e70ddaccdab125d1c5) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:07:46 UTC |
| a8f6d93 | Anton Khirnov | 28 November 2013, 09:54:35 UTC | pmpdec: check that there is at least one audio packet. The code cannot handle there being none, but that should not happen for valid files. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org (cherry picked from commit 1b5d065ca722eb8028c7a08e054b6da3419faf5d) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:01:18 UTC |
| ffa83bc | Anton Khirnov | 28 November 2013, 09:54:35 UTC | lzw: switch to bytestream2 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org (cherry picked from commit e89aa4bf56e5b5c45f569eb12733519789e057da) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:01:03 UTC |
| 819541f | Anton Khirnov | 15 November 2013, 09:23:04 UTC | gifdec: convert to bytestream2 (cherry picked from commit 1f3e56b6dcc163a705704e98569d4850a31d651c) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:00:51 UTC |
| c5c7e3e | Anton Khirnov | 15 November 2013, 09:15:24 UTC | gifdec: check that the image dimensions are non-zero Also add an error message an return a more suitable error code (INVALIDDATA, not EINVAL); Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org (cherry picked from commit c453723ad7d14abc5e82677eebaa6025fa598f08) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 22:00:40 UTC |
| 5e7a5dd | Anton Khirnov | 19 November 2012, 09:30:01 UTC | gifdec: return meaningful error codes. (cherry picked from commit 048ffb9bb26f30f1995400b8cd3809221ba03441) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 21:59:55 UTC |
| f194f2b | Anton Khirnov | 12 December 2013, 06:31:26 UTC | eacmv: check the framerate before setting it. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org (cherry picked from commit 24057c83207d6ea8bfd824155ac37be8a33dfd0c) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/eacmv.c | 05 January 2014, 21:57:17 UTC |
| 343c87a | Anton Khirnov | 28 November 2013, 09:54:35 UTC | rv30: fix extradata size check. It has been checking the number of bits in the offset instead of the actual offset. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org (cherry picked from commit a6a2282c25abe43e352010a7c3fbc92994c0bc1c) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 21:52:11 UTC |
| 1247958 | Martin Storsjö | 03 January 2014, 13:47:02 UTC | sdp: Check that fmt->oformat is non-null before accessing it This avoids crashes when avserver tries to create an SDP, since d77f4af. Addresses: CVE-2012-6617 CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 82b9799bb211ecd117171115e4a8b832c4942314) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 21:49:49 UTC |
| 3e089e8 | Aurelien Jacobs | 21 August 2011, 14:03:13 UTC | matroskadec: use correct compression parameters for current track CodecPrivate Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 8b516f154a0a08655cec2d13d12aadc58cae0b1c) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 21:49:15 UTC |
| 5dcc179 | Kostya Shishkov | 25 November 2013, 13:04:41 UTC | vc1: Reset numref if fieldmode is not set There are samples in the wild with B-frames and P-frames with different interlace mode. CC: libav-stable@libav.org Reported-by: Jean-Baptiste Kempf <jb@videolan.org> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit de44dfc7c0ec02bda7d846ef713145c890bfae3f) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 05 January 2014, 21:48:34 UTC |
| 848af79 | Michael Niedermayer | 22 December 2013, 17:47:28 UTC | nutenc/write_index: warn if 2 consecutive keyframes have the same PTS and discard the 2nd This fixes an assertion failure and regression and restores previous behaviour Fixes Ticket3197 An alternative would be to fail hard in this case and refuse to mux such data. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit de2a2caf4dedb28a959d0ff6f02751bb6c3ff033) | 24 December 2013, 07:09:53 UTC |
| 50ff83e | Michael Niedermayer | 21 December 2013, 01:43:44 UTC | Merge remote-tracking branch 'qatar/release/9' into release/1.1 * qatar/release/9: arm: Don't clobber callee saved registers in scalarproduct alsdec: check block length h264/mpegvideo: do not provide pixel formats for hwaccels that are not compiled in mpeg4video_parser: init mpeg4 static tables. Conflicts: libavcodec/mpeg4video_parser.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 21 December 2013, 01:43:44 UTC |
| 2d7f139 | Michael Niedermayer | 21 December 2013, 01:28:44 UTC | Merge commit '56eded8bc7bccdf14245bae3a45b0fecf9d9d122' into release/1.1 * commit '56eded8bc7bccdf14245bae3a45b0fecf9d9d122': mpeg4videodec: split initializing static tables into a separate function x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents pthread: Avoid spurious wakeups Conflicts: libavcodec/mpeg4videodec.c tests/fate/ac3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at> | 21 December 2013, 01:31:41 UTC |
| b589b8a | Michael Niedermayer | 21 December 2013, 01:14:24 UTC | Merge commit '1a5a6ac01b0ad2cf3d2128372ea41f3c1cfc2d3f' into release/1.1 * commit '1a5a6ac01b0ad2cf3d2128372ea41f3c1cfc2d3f': pthread: Fix deadlock during thread initialization Conflicts: libavcodec/pthread.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 21 December 2013, 01:14:24 UTC |
| 5bd291e | Michael Niedermayer | 21 October 2013, 14:21:14 UTC | avfilter/ff_insert_pad: fix order of operations Fixes out of bounds access Fixes CID732170 Fixes CID732169 No filter is known to use this function in a way so the issue can be reproduced. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ab2bfb85d49b2f8aa505816f93e75fd18ad0a361) Conflicts: libavfilter/avfilter.c (cherry picked from commit 86591b244f3a27293153896813f5569b49b2f5c0) Conflicts: libavfilter/avfilter.c (cherry picked from commit 400c4f8fa3fd58951dc3f356b2b00484e3363694) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 21 December 2013, 00:45:20 UTC |
| bdb975a | Martin Storsjö | 20 December 2013, 13:02:35 UTC | arm: Don't clobber callee saved registers in scalarproduct q4-q7/d8-d15 are supposed to not be clobbered by the callee. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit d307e408d4a9ada22df443cc38be77cc5e492694) Signed-off-by: Martin Storsjö <martin@martin.st> | 20 December 2013, 19:26:12 UTC |
| 3f7d890 | Reinhard Tartler | 08 December 2013, 18:24:26 UTC | alsdec: check block length Fix writing over the end Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Addresses: CVE-2013-0845 (cherry picked from commit 2a0fb7286d67c47e44aa76c237ede117b22af616) Signed-off-by: Reinhard Tartler <siretart@tauware.de> | 14 December 2013, 17:51:40 UTC |
| b8eaf47 | Michael Niedermayer | 05 December 2013, 00:41:10 UTC | avcodec/cabac: force get_cabac to be not inlined works around bug in gccs inline asm register assignment Fixes Ticket3177 gcc from 4.4 to 4.6 is affected at least, no non affected gccs known clang seems not affected Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0538b29ae8002c44f27bae8a1a6fc6e646998be5) | 09 December 2013, 09:37:41 UTC |
| 718a2dd | Anton Khirnov | 29 November 2013, 12:18:29 UTC | h264/mpegvideo: do not provide pixel formats for hwaccels that are not compiled in | 29 November 2013, 19:09:44 UTC |
| bd40547 | Anton Khirnov | 15 November 2013, 21:13:46 UTC | mpeg4video_parser: init mpeg4 static tables. They are used when decoding the frame header. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net> | 27 November 2013, 08:51:42 UTC |
| 56eded8 | Anton Khirnov | 15 November 2013, 21:13:45 UTC | mpeg4videodec: split initializing static tables into a separate function Signed-off-by: Anton Khirnov <anton@khirnov.net> | 27 November 2013, 08:47:01 UTC |
| f401e60 | Michael Niedermayer | 18 November 2013, 02:02:36 UTC | avformat/utils: dont count attached pics toward the probesize Such pics behave more like headers which we also dont count. Fixes Ticket3146 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a8dec360c5db15e8da4b44ff3c0f02a6c57e8ac0) | 18 November 2013, 14:15:37 UTC |
| 7f174ce | Clément Bœsch | 08 November 2013, 22:55:06 UTC | build: avoid stdin stall with GNU AS probing. a758c5e added probing for various tools, such as AS. Unfortunately, GNU AS is reading stdin with -v, and thus configure is stalled with configure arguments such as --as=as. Fixes Ticket #1898. (cherry picked from commit dbb41f93c16cbc65a899a75723c95da51c851cd5) | 18 November 2013, 14:15:23 UTC |
| a3f8c6a | Diego Biurrun | 26 April 2013, 14:48:39 UTC | x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents The function requires increasing the fuzz factor for the ac3/eac3 encode tests and even so makes fate fail. It only provides a slight encoding speedup for legacy CPUs that do not support SSE2. Thus its benefit is not worth the trouble it creates and fixing it would be a waste of time. | 31 October 2013, 11:09:55 UTC |
| 4c17e20 | Michael Niedermayer | 26 October 2013, 23:03:19 UTC | avformat/utils: do not override pts in h264 when they are provided from the demuxer Fixes Ticket2143 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1e5271a9fd6ddcceb083f2185a4bbd8d44c9a813) | 27 October 2013, 18:45:15 UTC |
| 6960372 | Michael Niedermayer | 25 October 2013, 23:22:38 UTC | h264: make flush_change() set mmco_reset This ensures that frames do not get mixed on context reinits Fixes Ticket2836 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3c9dd93faa9f3c250428dd0548c075583aa07cc3) | 26 October 2013, 00:43:50 UTC |
| 5bce35d | Michael Niedermayer | 25 October 2013, 18:03:29 UTC | avcodec/h264: reduce noisiness of "mmco: unref short failure" Do not consider it an error if we have no frames and should discard one. This condition can easily happen when decoding is started from an I frame Fixes Ticket2811 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 08a89761964bdd0a023eff6d37a1131fb7e1d7a0) Conflicts: libavcodec/h264_refs.c | 25 October 2013, 23:19:03 UTC |
| 8e72a8d | Michael Niedermayer | 25 October 2013, 17:35:55 UTC | avformat/mp3dec: perform seek resync in the correct direction Fixes seeking to the last frame in CBR files Fixes Ticket2773 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ba8716df7fb541fb690d1a898cda0e12f9011faf) | 25 October 2013, 23:15:06 UTC |
| a4b705b | Michael Niedermayer | 24 October 2013, 21:11:41 UTC | avcodec/h264: do not trust last_pic_droppable when marking pictures as done This simplifies the code and fixes a deadlock Fixes Ticket2927 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 29ffeef5e73b8f41ff3a3f2242d356759c66f91f) Conflicts: libavcodec/h264.c | 25 October 2013, 23:15:00 UTC |
| 802c4f5 | Michael Niedermayer | 04 October 2013, 15:39:19 UTC | avformat/mov: force parsing of headers if stts is absent Fixes Ticket2991 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e41ea866fc26f38d770bbc1ad67703e7f4400ae1) | 24 October 2013, 09:23:59 UTC |
| 6636dd5 | Michael Niedermayer | 09 October 2013, 21:52:54 UTC | avcodec/h264_refs: modify key frame detection heuristic to detect more cases Fixes Ticket2968 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5ac6b6028f17b64723884c9fa72cfcbd369a1ba2) Conflicts: libavcodec/h264_refs.c | 24 October 2013, 09:22:24 UTC |
| 8ffdcd0 | Michael Niedermayer | 05 October 2013, 22:07:28 UTC | avformat/matroskadec: only set r_frame_rate if the value is within reasonable limits Fixes Ticket2451 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6853e40106cac769f0641183ea0bdd530ae9a0a1) | 24 October 2013, 09:14:37 UTC |
| de32de6 | Michael Niedermayer | 09 October 2013, 19:43:06 UTC | avformat/wavdec: Dont trust the fact chunk for PCM Fixes Ticket3033 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 83fc6c822b06688e572333299927d93eb3c6c426) Conflicts: libavformat/wavdec.c | 24 October 2013, 09:13:59 UTC |
| 311583e | Ben Jackson | 18 October 2013, 14:28:50 UTC | pthread: Avoid spurious wakeups pthread_wait_cond can wake up unexpectedly (Wikipedia: Spurious_wakeup). The FF_THREAD_SLICE thread mechanism could spontaneously execute jobs or allow the caller of avctx->execute to return before all jobs were complete. Test both cases to ensure the wakeup is real. Signed-off-by: Ben Jackson <ben@ben.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 21 October 2013, 16:25:26 UTC |
| 1a5a6ac | Derek Buitenhuis | 10 October 2013, 15:05:40 UTC | pthread: Fix deadlock during thread initialization Sometimes, if pthread_create() failed, then pthread_cond_wait() could accidentally be called in the worker threads after the uninit function had already called pthread_cond_broadcast(), leading to a deadlock. Don't call pthread_cond_wait() if c->done is set. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> | 21 October 2013, 16:25:16 UTC |
| 4bc7c1b | Michael Niedermayer | 11 October 2013, 13:39:23 UTC | update for 1.1.7 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 11 October 2013, 13:39:23 UTC |
| 0efb4ff | Michael Niedermayer | 26 September 2013, 19:03:48 UTC | avcodec/parser: reset indexes on realloc failure Fixes Ticket2982 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f31011e9abfb2ae75bb32bc44e2c34194c8dc40a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 11 October 2013, 13:36:12 UTC |
| f0bb0aa | Michael Niedermayer | 09 September 2013, 15:58:18 UTC | avcodec/ffv1enc: update buffer check for 16bps Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3728603f1854b5c79d1a64dd3b41b80640ef1e7f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 11 October 2013, 13:36:12 UTC |
| eb3330b | Michael Niedermayer | 11 October 2013, 13:28:03 UTC | Merge remote-tracking branch 'TimothyGu/release/1.1' into release/1.1 * TimothyGu/release/1.1: doc/encoders: add doc for AAC encoder doc/ffmpeg-formats: Add documentation for 2 parameters that have been missing doc/encoders: improve libvo-aacenc doc doc/encoders: Remove options that were not there when branch was cut from master doc/encoders: reformat and add some clarification in libtwolame doc doc/encoders: reformat libmp3lame doc Merged-by: Michael Niedermayer <michaelni@gmx.at> | 11 October 2013, 13:28:11 UTC |
| e31e669 | Michael Niedermayer | 11 October 2013, 12:49:50 UTC | Delete changelog The merges have filled the changelog of the 1.1 branch with bugfix entries that ffmpeg 1.1 was never affected by or that where fixed long ago. No one has cleaned this mess up and its better to have no changelog file than one that is 80% wrong. If someone wants to clean this up, thats of course very welcome, aka yes patches and pull requests welcome! Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 11 October 2013, 12:49:50 UTC |
| 835bc39 | Michael Niedermayer | 11 October 2013, 11:05:31 UTC | Merge remote-tracking branch 'qatar/release/9' into release/1.1 * qatar/release/9: Fix top-level description update Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at> | 11 October 2013, 12:49:28 UTC |
| bb81b2b | Reinhard Tartler | 10 October 2013, 13:56:40 UTC | Fix top-level description | 10 October 2013, 13:56:40 UTC |
| 58287d3 | Reinhard Tartler | 10 October 2013, 12:50:09 UTC | update Changelog | 10 October 2013, 12:50:09 UTC |
| 2a7bdbf | Michael Niedermayer | 08 October 2013, 22:30:46 UTC | ffserver: strip odd chars from html error messages before sending them back Fixes Ticket3034 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 885739f3b4ca3fb60abf417120845e3fcfb99b53) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 08 October 2013, 22:55:38 UTC |
| 653cdf4 | Michael Niedermayer | 08 October 2013, 00:11:31 UTC | Merge remote-tracking branch 'qatar/release/9' into release/1.1 * qatar/release/9: Prepare for 9.10 RELEASE h263dec: Remove a hack that can cause infinite loops mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0 vc1dec: Don't decode slices when the latest slice header failed to decode Conflicts: RELEASE libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 08 October 2013, 00:11:31 UTC |
| 829e430 | Michael Niedermayer | 07 October 2013, 23:56:25 UTC | Merge commit '494f2d4f9e834db1eaf1a7d0160d497f9802013d' into release/1.1 * commit '494f2d4f9e834db1eaf1a7d0160d497f9802013d': vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks r3d: Add more input value validation fraps: Make the input buffer size checks more strict svq3: Avoid a division by zero rmdec: Validate the fps value twinvqdec: Check the ibps parameter separately asfdec: Check the return value of asf_read_stream_properties mxfdec: set audio timebase to 1/samplerate Conflicts: libavcodec/fraps.c libavcodec/svq3.c libavformat/mxfdec.c tests/ref/fate/mxf-demux tests/ref/seek/lavf-mxf tests/ref/seek/lavf-mxf_d10 Merged-by: Michael Niedermayer <michaelni@gmx.at> | 08 October 2013, 00:03:40 UTC |
| 8d14e1d | Michael Niedermayer | 07 October 2013, 23:41:20 UTC | Merge commit '7e350b7ddd19af856b55634233d609e29baab646' into release/1.1 * commit '7e350b7ddd19af856b55634233d609e29baab646': pcx: Check the packet size before assuming it fits a palette rpza: Fix a buffer size check xxan: Disallow odd width xan: Only read within the data that actually was initialized xan: Use bytestream2 to limit reading to within the buffer pcx: Consume the whole packet if giving up due to missing palette pngdec: Stop trying to decode once inflate returns Z_STREAM_END mov: Make sure the read sample count is nonnegative bfi: Add some very basic sanity checks for input packet sizes bfi: Avoid divisions by zero electronicarts: Add more sanity checking for the number of channels riffdec: Add sanity checks for the sample rate Conflicts: libavcodec/pcx.c libavcodec/xan.c libavformat/mov.c libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 07 October 2013, 23:41:20 UTC |
| 5da68af | Michael Niedermayer | 07 October 2013, 23:26:51 UTC | Merge commit '04d2f9ace3fb6e880f3488770fc5a39de5b63cbb' into release/1.1 * commit '04d2f9ace3fb6e880f3488770fc5a39de5b63cbb': mvi: Add sanity checking for the audio frame size alac: Do bounds checking of lpc_order read from the bitstream xwma: Avoid division by zero avidec: Make sure a packet is large enough before reading its data vqf: Make sure the bitrate is in the valid range vqf: Make sure sample_rate is set to a valid value electronicarts: Check packet sizes before reading lavf: Avoid setting avg_frame_rate if delta_dts is negative vc1dec: Undo mpegvideo initialization if unable to allocate tables vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors wnv1: Make sure the input packet is large enough dcadec: Validate the lfe parameter Conflicts: libavcodec/dcadec.c libavcodec/wnv1.c libavformat/avidec.c libavformat/electronicarts.c libavformat/utils.c libavformat/xwma.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 07 October 2013, 23:26:51 UTC |
| 55aedd6 | Michael Niedermayer | 07 October 2013, 23:06:45 UTC | Merge commit 'ce1dacb435460dda1f9d453eaaeac44bd502aca4' into release/1.1 * commit 'ce1dacb435460dda1f9d453eaaeac44bd502aca4': rl2: Avoid a division by zero wtv: Add more sanity checks for a length read from the file segafilm: Validate the number of audio channels qpeg: Add checks for running out of rows in qpeg_decode_inter mpegaudiodec: Validate that the number of channels fits at the given offset asvdec: Verify the amount of extradata idroqdec: Make sure a video stream has been allocated before returning packets rv10: Validate the dimensions set from the container xmv: Add more sanity checks for parameters read from the bitstream ffv1: Make sure at least one slice context is initialized truemotion2: Use av_freep properly in an error path eacmv: Make sure a reference frame exists before referencing it mpeg4videodec: Check the width/height in mpeg4_decode_sprite_trajectory ivi_common: Make sure color planes have been initialized mov: Don't use a negative duration for setting other fields Conflicts: libavcodec/eacmv.c libavcodec/ffv1.c libavcodec/mpeg4videodec.c libavcodec/mpegaudiodec.c libavcodec/qpeg.c libavformat/mov.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 07 October 2013, 23:06:45 UTC |
| af26185 | Michael Niedermayer | 07 October 2013, 22:49:18 UTC | Merge commit '163196562fe744149ef599d754c30c08a9898381' into release/1.1 * commit '163196562fe744149ef599d754c30c08a9898381': oggparseogm: Convert to use bytestream2 rv34: Check the return value from ff_rv34_decode_init matroskadec: Verify realaudio codec parameters mace: Make sure that the channel count is set to a valid value svq3: Check for any negative return value from ff_h264_check_intra_pred_mode vp3: Check the framerate for validity cavsdec: Make sure a sequence header has been decoded before decoding pictures vocdec: Don't update codec parameters mid-stream sierravmd: Do sanity checking of frame sizes omadec: Properly check lengths before incrementing the position mpc8: Make sure the first stream exists before parsing the seek table Conflicts: libavcodec/mace.c libavformat/oggparseogm.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 07 October 2013, 22:49:18 UTC |
| af1fb1d | Michael Niedermayer | 07 October 2013, 22:24:54 UTC | Merge commit 'f8a72f041c049e812dfa1f32156327e9778f5710' into release/1.1 * commit 'f8a72f041c049e812dfa1f32156327e9778f5710': mpc8: Check the seek table size parsed from the bitstream zmbvdec: Check the buffer size for uncompressed data ape: Don't allow the seektable to be omitted shorten: Break out of loop looking for fmt chunk if none is found shorten: Use a checked bytestream reader for the wave header smacker: Make sure we don't fill in huffman codes out of range smacker: Avoid integer overflow when allocating packets smacker: Don't return packets in unallocated streams dsicin: Add some basic sanity checks for fields read from the file Conflicts: libavcodec/shorten.c libavcodec/smacker.c libavcodec/zmbv.c libavformat/mpc8.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 07 October 2013, 22:24:54 UTC |
| a9fc88e | Reinhard Tartler | 04 October 2013, 23:14:27 UTC | Prepare for 9.10 RELEASE | 04 October 2013, 23:14:27 UTC |
| 23e4284 | Martin Storsjö | 23 September 2013, 09:25:48 UTC | h263dec: Remove a hack that can cause infinite loops 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> (cherry picked from commit 8812a8057f539845f6801cafdf6c481a59e96b48) Signed-off-by: Martin Storsjö <martin@martin.st> | 04 October 2013, 21:31:31 UTC |
| 42c7ed4 | Martin Storsjö | 24 September 2013, 09:02:39 UTC | mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0 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> (cherry picked from commit 5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d) Signed-off-by: Martin Storsjö <martin@martin.st> | 04 October 2013, 21:31:20 UTC |
| 494f2d4 | Martin Storsjö | 20 September 2013, 08:32:25 UTC | vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 5e25fdbfe01635cfc650ac4adc27d434b2df0d64) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/vc1dec.c | 04 October 2013, 02:45:35 UTC |
| 9597807 | Michael Niedermayer | 19 February 2013, 20:40:09 UTC | vc1dec: Don't decode slices when the latest slice header failed to decode Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> Conflicts: libavcodec/vc1dec.c | 04 October 2013, 02:45:35 UTC |
| 99fe4c5 | Martin Storsjö | 19 September 2013, 14:02:36 UTC | r3d: Add more input value validation Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> Conflicts: libavformat/r3d.c | 04 October 2013, 02:45:35 UTC |
| 98e1f0a | Martin Storsjö | 19 September 2013, 13:29:23 UTC | fraps: Make the input buffer size checks more strict Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> Conflicts: libavcodec/fraps.c | 04 October 2013, 02:45:34 UTC |
| 3ee5458 | Martin Storsjö | 19 September 2013, 12:58:59 UTC | svq3: Avoid a division by zero If the height is zero, the decompression will probably end up failing due to not fitting into the allocated buffer later anyway, so this doesn't need any more elaborate check. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 601c2015bc16f0b281160292a6a760cbbbb0eacb) | 04 October 2013, 02:45:34 UTC |
| 99f953b | Martin Storsjö | 16 September 2013, 17:58:38 UTC | rmdec: Validate the fps value Abort if it is invalid if strict error checking has been requested. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 0f310a6f333b016d336674d086045e8473fdf918) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavformat/rmdec.c | 04 October 2013, 02:45:34 UTC |
| 9b9aee2 | Martin Storsjö | 17 September 2013, 16:33:48 UTC | twinvqdec: Check the ibps parameter separately This is required, since invalid parameters actually could pass the switch check below. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit c77d409bf95954aceb762dd800d1ee2868c4b0d4) | 04 October 2013, 02:45:24 UTC |
| 7e350b7 | Martin Storsjö | 29 September 2013, 10:02:27 UTC | pcx: Check the packet size before assuming it fits a palette 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> (cherry picked from commit d1d99e3befea5d411ac3aae72dbdecce94f8b547) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/pcx.c | 04 October 2013, 01:52:11 UTC |
