| 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 |
| f06e39f | Martin Storsjö | 28 September 2013, 22:24:20 UTC | rpza: Fix a buffer size check 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> (cherry picked from commit 7ba0cedbfeff5671b264d1d7e90777057b5714c6) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:11 UTC |
| 3ac156b | Martin Storsjö | 28 September 2013, 22:04:05 UTC | xxan: Disallow odd width 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> (cherry picked from commit aa0dd52434768da64f1f3d8ae92bcf980c1adffc) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:11 UTC |
| fc4d11e | Martin Storsjö | 28 September 2013, 20:32:57 UTC | asfdec: Check the return value of asf_read_stream_properties This makes sure errors in setting stream parameters are passed on to the caller. This avoids successfully opening files while some parameters aren't filled in properly. 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 cc41167aede4c101ad17eeffa8f39bb6c23d3dad) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:11 UTC |
| fd2ba18 | Anton Khirnov | 28 September 2013, 14:56:54 UTC | mxfdec: set audio timebase to 1/samplerate Fixes sync in some samples (e.g. bugs 7581 and 8374 in VLC). Based on a commit by Matthieu Bouron <matthieu.bouron@gmail.com> Reported-by: Jean-Baptiste Kempf <jb@videolan.org> CC: libav-stable@libav.org (cherry picked from commit 93370d12164236d59645314871a1d6808b2a8ddb) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:11 UTC |
| 09ace61 | Martin Storsjö | 28 September 2013, 21:59:50 UTC | xan: Only read within the data that actually was initialized 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 fc739b3eefa0b58d64e7661621da94a94dbc8a82) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:10 UTC |
| 145de32 | Martin Storsjö | 28 September 2013, 21:53:58 UTC | xan: Use bytestream2 to limit reading to within the buffer 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 30db94dc399f6e4ef8905049d9b740556f0fce47) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:10 UTC |
| 812955a | Martin Storsjö | 28 September 2013, 21:38:50 UTC | pcx: Consume the whole packet if giving up due to missing palette 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> (cherry picked from commit 9fb0de86b49e9fb0709a8ad1e1875e35da841887) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:10 UTC |
| a63e83c | Martin Storsjö | 28 September 2013, 21:12:04 UTC | pngdec: Stop trying to decode once inflate returns Z_STREAM_END 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> (cherry picked from commit a81cad8f86d1feb7e4bfae29e43f3e994935a5c7) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:10 UTC |
| c10f3fe | Martin Storsjö | 28 September 2013, 20:57:36 UTC | mov: Make sure the read sample count is nonnegative This avoids setting a negative number of frames, ending up with a negative average frame rate. 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 c231987662194d009dd91bfc57c678e0e70ca161) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:10 UTC |
| 04d2f9a | Martin Storsjö | 28 September 2013, 20:26:18 UTC | mvi: Add sanity checking for the audio frame size This avoids a division by zero. 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 28ff439efd2362fb21e1a78610737f2e26a72d8f) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:09 UTC |
| 10f384e | Martin Storsjö | 28 September 2013, 20:46:04 UTC | bfi: Add some very basic sanity checks for input packet sizes CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 640a2427aafa774b83316b7a8c5c2bdc28bfd269) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:09 UTC |
| 78aa2ed | Martin Storsjö | 27 September 2013, 21:22:52 UTC | alac: Do bounds checking of lpc_order read from the bitstream 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> (cherry picked from commit 59480abce7e4238e22b3a4a904a9fe6abf4e4188) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:09 UTC |
| ad1223d | Martin Storsjö | 28 September 2013, 20:42:40 UTC | bfi: Avoid divisions by zero If a zero-length video packet is to be returned, just return AVERROR(EAGAIN) and switch back to the audio stream. 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 9fc7184d1a9af8d97b3fc5c2ef9d0a647d6617ea) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:09 UTC |
| a89868d | Martin Storsjö | 28 September 2013, 20:38:40 UTC | electronicarts: Add more sanity checking for the number of channels 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 a9221e39600a31ee13e736e9e47743cde23f0280) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavformat/electronicarts.c | 04 October 2013, 01:52:09 UTC |
| 607863a | Martin Storsjö | 28 September 2013, 20:32:39 UTC | riffdec: Add sanity checks for the sample rate This avoids a division by zero for G726. 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 d07aa3f02b73ab1371c13ac7898338380ca0932b) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:09 UTC |
| 2ff935a | Martin Storsjö | 28 September 2013, 20:13:26 UTC | xwma: Avoid division by zero 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 adc09136a4a63b152630abeacb22c56541eacf60) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:08 UTC |
| 2e4c649 | Martin Storsjö | 27 September 2013, 21:41:31 UTC | avidec: Make sure a packet is large enough before reading its data 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 8d07258bb6063d0780ce2d39443d6dc6d8eedc5a) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavformat/avidec.c | 04 October 2013, 01:52:08 UTC |
| 6070146 | Martin Storsjö | 28 September 2013, 20:19:10 UTC | vqf: Make sure the bitrate is in the valid range Even if the sample rate is valid, an invalid bitrate could pass the mode combination test below. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 68ff9981283a56c731f00c2ee7901103665092fc) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:08 UTC |
| 4d60ab6 | Martin Storsjö | 27 September 2013, 21:34:35 UTC | vqf: Make sure sample_rate is set to a valid value This avoids divisions by zero later (and possibly assertions in time base scaling), since an invalid rate_flag combined with an invalid bitrate below could pass the mode combination test. 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 9277050e2918e0a0df9689721a188a604d886616) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:52:08 UTC |
| 8bd27a1 | Martin Storsjö | 20 September 2013, 09:26:45 UTC | electronicarts: Check packet sizes before reading 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 f7e616959aff8706edccdae763c24c897c449f6f) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:30 UTC |
| 17e7edf | Martin Storsjö | 20 September 2013, 09:20:06 UTC | lavf: Avoid setting avg_frame_rate if delta_dts is negative This avoids setting avg_frame_rate to invalid (negative) values. 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 ce67f442be0f6c4a8794272873852e256b5b8ee4) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:29 UTC |
| a6a8f66 | Martin Storsjö | 20 September 2013, 08:16:57 UTC | vc1dec: Undo mpegvideo initialization if unable to allocate tables 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> (cherry picked from commit b772b0e28eba6abf76d86ee8c6e459a86642db5a) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:29 UTC |
| b627048 | Martin Storsjö | 20 September 2013, 08:16:00 UTC | vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors 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 ede508443e4bf57dc1e019fac81bf6244b88fbd3) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:29 UTC |
| 0c8c6b4 | Martin Storsjö | 19 September 2013, 21:07:34 UTC | wnv1: Make sure the input packet is large enough 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 91be1103fd1f79d381edf268c32f4166b6c3b6d8) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:29 UTC |
| 97b6916 | Martin Storsjö | 19 September 2013, 12:12:06 UTC | dcadec: Validate the lfe parameter 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 a9d50bb578ec04c085a25f1e023f75e0e4499d5e) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:29 UTC |
| ce1dacb | Martin Storsjö | 19 September 2013, 13:57:47 UTC | rl2: Avoid a division by zero 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 3ca14aa5964ea5d11f7a15f9fff17924d6096d44) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:28 UTC |
| 78dc022 | Martin Storsjö | 19 September 2013, 13:55:13 UTC | wtv: Add more sanity checks for a length read from the file Also make sure the existing length check can't overflow. 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 83c285f88016b087c2f0f4b9ef356ad8ef12d947) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:28 UTC |
| 5379c51 | Martin Storsjö | 19 September 2013, 13:02:29 UTC | segafilm: Validate the number of audio channels This avoids divisions by zero later. 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 82e266c6d3fbf3cc74e515b883e66543381a0f2c) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:28 UTC |
| 4d90550 | Martin Storsjö | 19 September 2013, 12:53:31 UTC | qpeg: Add checks for running out of rows in qpeg_decode_inter 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 7a5a55722749a3ab77941914707277b147322cbe) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:28 UTC |
| bacf5db | Martin Storsjö | 19 September 2013, 12:32:02 UTC | mpegaudiodec: Validate that the number of channels fits at the given offset This is similar to the fix in 35cbc98b. 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 e9d61de96c113ee0ef8082833c7e682df0e23eec) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:28 UTC |
| 5358f1b | Martin Storsjö | 19 September 2013, 12:14:56 UTC | asvdec: Verify the amount of extradata The init function reads one byte of extradata. 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 f50803354c6acb4575379d7c54ca48ec5d36dd61) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:27 UTC |
| de75bc0 | Martin Storsjö | 16 September 2013, 11:53:15 UTC | idroqdec: Make sure a video stream has been allocated before returning packets 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 bcbe4f3ceb6ee0210d3a401963518906c8b9b230) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:27 UTC |
| 0b0f1cd | Martin Storsjö | 16 September 2013, 12:40:57 UTC | rv10: Validate the dimensions set from the container 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 5372cda67109848d22146289e401669266217e80) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:27 UTC |
| 00516b5 | Martin Storsjö | 16 September 2013, 18:27:49 UTC | xmv: Add more sanity checks for parameters read from the bitstream Since the number of channels is multiplied by 36 and assigned to to a uint16_t, make sure this calculation didn't overflow. (In certain cases the calculation could overflow leaving the truncated block_align at 0, leading to divisions by zero later.) 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 d4c2a3740fb95f952a87ba320d2bf31f126bdf68) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:27 UTC |
| 3706c22 | Martin Storsjö | 16 September 2013, 18:46:50 UTC | ffv1: Make sure at least one slice context is initialized This avoids crashes when initializing the range coder for the first slice context. 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 b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:27 UTC |
| eac1c3f | Martin Storsjö | 16 September 2013, 18:03:34 UTC | truemotion2: Use av_freep properly in an error path 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 c39f7eba01cd656e8f0eed592f93d11814736650) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:27 UTC |
| 1631965 | Martin Storsjö | 16 September 2013, 14:17:26 UTC | oggparseogm: Convert to use bytestream2 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 19b9659f3174599e8685d329c4330b1ea8c4c6db) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:26 UTC |
| 20c8f17 | Martin Storsjö | 16 September 2013, 13:01:02 UTC | rv34: Check the return value from ff_rv34_decode_init 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 711c970168297683860422e95d6b7e37ee3c8367) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:26 UTC |
| 2e12af4 | Martin Storsjö | 16 September 2013, 18:07:30 UTC | eacmv: Make sure a reference frame exists before referencing it This is similar to an existing check for the second-last frame from 062421e3. 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 ea78a348d86a3a733f6c1e0a65cfdd8283d924b9) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/eacmv.c | 04 October 2013, 01:26:26 UTC |
| c8c9379 | Martin Storsjö | 16 September 2013, 17:40:13 UTC | mpeg4videodec: Check the width/height in mpeg4_decode_sprite_trajectory This avoids a potential division by zero. 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 f875a732e36786d49f3650e3235272891a820600) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:26 UTC |
| 38bd229 | Martin Storsjö | 16 September 2013, 17:32:35 UTC | ivi_common: Make sure color planes have been initialized 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 a92538b7c0defc86c55fb91f55dfa36aad192673) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:26 UTC |
| fe8bc7d | Martin Storsjö | 16 September 2013, 17:17:47 UTC | mov: Don't use a negative duration for setting other fields Some files have the duration set to -1 in the mdhd atom, more or less legitimately. (We produce such files ourselves, for the initial duration in fragmented mp4 files.) 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 7f8d41eb097e8d4223c9caf97dd332a2fdb29d52) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:26 UTC |
| 9f7a8b8 | Martin Storsjö | 16 September 2013, 12:36:24 UTC | matroskadec: Verify realaudio codec parameters 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 569d18aa9dc989c37bb4d4b968026fe5afa6fff9) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:25 UTC |
| 9272aa4 | Martin Storsjö | 16 September 2013, 12:19:52 UTC | mace: Make sure that the channel count is set to a valid value Also return a proper error code. 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 e1f3847f860a1094a46be4c5f10db8df616c3135) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/mace.c | 04 October 2013, 01:26:25 UTC |
| aeca97a | Martin Storsjö | 16 September 2013, 12:05:03 UTC | svq3: Check for any negative return value from ff_h264_check_intra_pred_mode Also pass on any returned error code. 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 1115689d54ea95a084421f5a182b8dc56cbff978) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/svq3.c | 04 October 2013, 01:26:25 UTC |
| b4c479a | Martin Storsjö | 12 September 2013, 09:27:58 UTC | vp3: Check the framerate for validity 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 6fc8226e29055858f28973bb3d27b63b3b65e616) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 04 October 2013, 01:26:25 UTC |
| 9f883e7 | Martin Storsjö | 12 September 2013, 08:58:25 UTC | cavsdec: Make sure a sequence header has been decoded before decoding pictures 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 e90a6846c2c006fbebd00e1f2789f4a86fafacef) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/cavsdec.c | 04 October 2013, 01:26:24 UTC |
| e47543e | Martin Storsjö | 12 September 2013, 08:31:53 UTC | vocdec: Don't update codec parameters mid-stream If we really want to support parameter changes, they need to be signalled along with the AVPackets as parameter change side data, not just changing the AVCodecContext parameters when a packet is demuxed (since there may be other earlier packets yet undecoded). Something similar was already done for the sample rate in 0883109b2, but some parameters were left changeable. This avoids having to recheck the channel count for validity for each decoded frame in (ad)pcm decoders, unless the decoders explicitly say that they accept parameter changes. 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 5bbfe193a0a41bd2adb648c8c3f6901a575734a2) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 03 October 2013, 21:31:38 UTC |
| 153deed | Martin Storsjö | 11 September 2013, 19:56:55 UTC | sierravmd: Do sanity checking of frame sizes Limit the size to INT_MAX/2 (for simplicity) to be sure that size + BYTES_PER_FRAME_RECORD won't overflow. Also factorize other existing error return paths. 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 0ef1660a6365ce60ead8858936b6f3f8ea862826) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 03 October 2013, 21:31:34 UTC |
| 9eba02d | Martin Storsjö | 11 September 2013, 11:54:05 UTC | omadec: Properly check lengths before incrementing the position 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 342c43d154e586bc022c86b168fe8d36f69da9d3) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 03 October 2013, 21:31:22 UTC |
| 557df77 | Martin Storsjö | 11 September 2013, 19:53:15 UTC | mpc8: Make sure the first stream exists before parsing the seek table 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 17d57848fc14e82f76a65ffb25c90f2f011dc4a0) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 03 October 2013, 18:29:36 UTC |
| f8a72f0 | Martin Storsjö | 11 September 2013, 19:47:06 UTC | mpc8: Check the seek table size parsed from the bitstream Limit the size to INT_MAX/2 (for simplicity) to be sure that size + FF_INPUT_BUFFER_PADDING_SIZE won't overflow. 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 459f2b393a3f89ed08d10fbceb4738d1429f268e) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 03 October 2013, 18:29:34 UTC |
| 9e50506 | Michael Niedermayer | 11 November 2012, 17:08:39 UTC | zmbvdec: Check the buffer size for uncompressed data Also don't pointlessly set the buffer size to 1 after copying one packet. 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 0d61f260010707f3028b818e8b24598e1a83d696) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 03 October 2013, 18:29:33 UTC |
| eba112b | Martin Storsjö | 11 September 2013, 19:29:33 UTC | ape: Don't allow the seektable to be omitted The seektable is required for filling in ape->frames[i].pos further down. 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 183b9d843a9533774fabd3984a52f3987001acbc) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 03 October 2013, 18:29:31 UTC |
| d411f07 | Martin Storsjö | 11 September 2013, 19:19:28 UTC | shorten: Break out of loop looking for fmt chunk if none is found 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 b26742cc308552f242ee2bf93b07a3ff509f4edc) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 03 October 2013, 18:29:29 UTC |
| 8484351 | Martin Storsjö | 11 September 2013, 19:17:13 UTC | shorten: Use a checked bytestream reader for the wave header 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 49568851bf1700e3d9ea9cda29208d0df3c2c38b) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 03 October 2013, 18:29:27 UTC |
| 01a58b4 | Martin Storsjö | 11 September 2013, 12:54:20 UTC | smacker: Make sure we don't fill in huffman codes out of range 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 0679cec6e8802643bbe6d5f68ca1110a7d3171da) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 03 October 2013, 18:29:25 UTC |
| 47bb4d8 | Martin Storsjö | 11 September 2013, 12:25:13 UTC | smacker: Avoid integer overflow when allocating packets 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 710b0e27025948b7511821c2f888ff2d74a59e14) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 03 October 2013, 18:29:24 UTC |
| 057f655 | Martin Storsjö | 11 September 2013, 12:20:01 UTC | smacker: Don't return packets in unallocated streams 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 8d928023f953a28692ba27071a448259134b103b) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 03 October 2013, 18:29:21 UTC |
| 3bd0cd2 | Martin Storsjö | 11 September 2013, 12:13:48 UTC | dsicin: Add some basic sanity checks for fields read from the file 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 48d6556dd46d4f4fac10d0f4a819e314887cd50e) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 03 October 2013, 18:29:15 UTC |
| a4acb5b | Timothy Gu | 08 September 2013, 23:32:22 UTC | doc/encoders: add doc for AAC encoder Thanks-to: Kostya Shishkov <kostya.shishkov@gmail.com> Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 0e11790cf7eef3b0f38a64486da1e3fb8c7f14b8) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 22 September 2013, 22:22:34 UTC |
| c42fd4c | Timothy Gu | 16 September 2013, 02:08:58 UTC | doc/ffmpeg-formats: Add documentation for 2 parameters that have been missing (partially cherry picked from commit b7dd4598630fb1f890ae060f21a9ec92a103f22d) Signed-off-by: Timothy Gu <timothygu99@gmail.com> Conflicts: doc/formats.texi | 22 September 2013, 22:11:00 UTC |
| 3eee214 | Timothy Gu | 08 September 2013, 03:13:11 UTC | doc/encoders: improve libvo-aacenc doc Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 81bbe49a0e588aa899f37a567808ba8926d798d6) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 22 September 2013, 22:01:32 UTC |
| 852ee0e | Timothy Gu | 08 September 2013, 23:56:39 UTC | doc/encoders: Remove options that were not there when branch was cut from master Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 22 September 2013, 21:59:41 UTC |
| ed2c15e | Timothy Gu | 03 August 2013, 23:55:40 UTC | doc/encoders: reformat and add some clarification in libtwolame doc Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit e45e72f5f89ef5a5791562cfcb935028b46ecd0a) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 22 September 2013, 21:59:41 UTC |
| 4ad0330 | Timothy Gu | 03 August 2013, 23:51:26 UTC | doc/encoders: reformat libmp3lame doc Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 40b8350b57adaa9aaf6731bac5130d4fec1639c3) Conflicts: doc/encoders.texi | 22 September 2013, 21:59:41 UTC |
| 9fde820 | Carl Eugen Hoyos | 09 September 2013, 08:03:14 UTC | Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10. Fixes ticket #2945. Reviewed-by: Matthieu Bouron (cherry picked from commit d73565d5ddf41d4b7805327cdb271c59d8c3fc59) | 12 September 2013, 21:17:32 UTC |
| b5e2ef7 | Carl Eugen Hoyos | 09 September 2013, 08:02:12 UTC | Store the video bit_rate in the context when muxing mxf. This will allow using rc_max_rate if no bit_rate is specified (on remuxing). Reviewed-by: Matthieu Bouron (cherry picked from commit 52cf08b4c8859f7cac010a7a59f7aa369384ad85) | 12 September 2013, 21:17:31 UTC |
| 63e370b | Clément Bœsch | 08 September 2013, 07:55:02 UTC | avformat/subtitles: check lower bound for duration overlap seeking. (cherry picked from commit 1ca4bf930bab681a79fb591330043675c7cfd798) | 10 September 2013, 19:44:43 UTC |
| af225c4 | Clément Bœsch | 08 September 2013, 07:43:53 UTC | avformat/vobsub: fix seeking. (cherry picked from commit f8678dcef3c5b0ea82e898e1f419863409fa135f) | 10 September 2013, 19:44:39 UTC |
| bf31271 | Michael Niedermayer | 09 September 2013, 06:44:14 UTC | Merge remote-tracking branch 'qatar/release/9' into release/1.1 * qatar/release/9: Update Changelog Prepare for 9.9 RELEASE lavf: fix the comparison in an overflow check dv: Add a guard to not overread the ppcm array nuv: check ff_rtjpeg_decode_frame_yuv420 return value Conflicts: Changelog RELEASE libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 09 September 2013, 07:10:20 UTC |
| 8715ca0 | Paul B Mahol | 08 September 2013, 12:35:31 UTC | avformat/matroskaenc: remove bogus prores tag Fixes: ffmpeg -i input -c:v prores output.mkv Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 14851ca5f5a3af140085e82589e28e06c7cdefdc) Conflicts: libavformat/matroskaenc.c | 08 September 2013, 20:37:48 UTC |
| 4d073dd | Sean McGovern | 02 September 2013, 16:22:14 UTC | Update Changelog Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 08 September 2013, 06:15:21 UTC |
