| 14e258d | Michael Niedermayer | 02 October 2013, 23:28:06 UTC | update for 1.2.4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 02 October 2013, 23:28:06 UTC |
| ca47aec | Michael Niedermayer | 02 October 2013, 23:18:14 UTC | Merge remote-tracking branch 'TimothyGu/release/1.2' into release/1.2 * TimothyGu/release/1.2: doc/encoders: add doc for AAC encoder doc/encoders: improve libvo-aacenc doc doc/ffmpeg-formats: Add documentation for 3 parameters that have been missing 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> | 02 October 2013, 23:18:26 UTC |
| 95e26d3 | 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> | 02 October 2013, 23:04:19 UTC |
| f32051c | 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> | 02 October 2013, 23:04:19 UTC |
| c3ee5b4 | Michael Niedermayer | 08 September 2013, 18:27:54 UTC | avcodec/truemotion2: Fix av_freep arguments Fixes null pointer dereference Fixes Ticket2944 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c54aa2fb0f869ec025933944cbd1634fffe95d09) Conflicts: libavcodec/truemotion2.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 02 October 2013, 23:04:19 UTC |
| c17fd9f | Michael Niedermayer | 04 September 2013, 22:36:44 UTC | avcodec/mjpegdec: Add some sanity checks to ljpeg_decode_rgb_scan() These prevent the rgb ljpeg code from being run on parameters that it doesnt support. No testcase available but it seems possible to trigger these. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 61c68000eda643dfce96dc46b488d39fd5c4e309) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 02 October 2013, 23:04:18 UTC |
| 0f3cddd | Michael Niedermayer | 02 September 2013, 02:32:23 UTC | avfilter/vf_fps: make sure the fifo is not empty before using it Fixes Ticket2905 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cdd5df8189ff1537f7abe8defe971f80602cc2d2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 02 October 2013, 23:04:18 UTC |
| a0d13f5 | Michael Niedermayer | 30 August 2013, 21:40:47 UTC | avcodec/dsputil: fix signedness in sizeof() comparissions Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 454a11a1c9c686c78aa97954306fb63453299760) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 02 October 2013, 23:04:18 UTC |
| 91e19ab | Michael Niedermayer | 30 August 2013, 04:08:32 UTC | ffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 headers Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b05cd1ea7e45a836f7f6071a716c38bb30326e0f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 02 October 2013, 23:04:18 UTC |
| bb4126e | Michael Niedermayer | 30 August 2013, 02:51:09 UTC | ffv1dec: check that global parameters dont change in version 0/1 Such changes are not allowed nor supported Fixes Ticket2906 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 547d690d676064069d44703a1917e0dab7e33445) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 02 October 2013, 23:04:18 UTC |
| 9902eef | Michael Niedermayer | 30 August 2013, 01:43:49 UTC | avcodec/ffv1dec: check global header version Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 20b965a1a43ae88b7ae95635d5a3570e7dc2bbd4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 02 October 2013, 23:04:18 UTC |
| 6db67ac | 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:18:16 UTC |
| 85eeab4 | 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:16:23 UTC |
| 4431ee1 | Timothy Gu | 16 September 2013, 02:08:58 UTC | doc/ffmpeg-formats: Add documentation for 3 parameters that have been missing Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b7dd4598630fb1f890ae060f21a9ec92a103f22d) Signed-off-by: Timothy Gu <timothygu99@gmail.com> Conflicts: doc/formats.texi | 22 September 2013, 22:14:57 UTC |
| d2feaf2 | 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:58:21 UTC |
| 0f73cb4 | 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:58:21 UTC |
| 82cfb8c | 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:58:21 UTC |
| 0a55c88 | Clément Bœsch | 08 September 2013, 16:28:11 UTC | avcodec/srtdec: fix potential overread. (cherry picked from commit 3a54c221d574ec944db1eddf9df895808f32bf9e) Signed-off-by: Alexander Strasser <eclipse7@gmx.net> | 16 September 2013, 19:39:34 UTC |
| c09acf9 | Clément Bœsch | 08 September 2013, 16:02:45 UTC | avformat/subtitles: add a next line jumper and use it. This fixes a bunch of possible overread in avformat with the idiom p += strcspn(p, "\n") + 1 (strcspn() can focus on the trailing '\0' if no '\n' is found, so the +1 leads to an overread). Note on lavf/matroskaenc: no extra subtitles.o Makefile dependency is added because only the header is required for ff_subtitles_next_line(). Note on lavf/mpsubdec: code gets slightly complex to avoid an infinite loop in the probing since there is no more forced increment. NOTE: Code of function ff_subtitles_next_line fixed by Alexander Strasser. The original code from master did test the wrong character, but was corrected by a subsequent commit. That commit however is not backported, so it had to be fixed in this commit for the backport. Conflicts: libavformat/mpl2dec.c (cherry picked from commit 90fc00a623de44e137fe1601b91356e8cd8bdd54) Signed-off-by: Alexander Strasser <eclipse7@gmx.net> | 16 September 2013, 19:39:34 UTC |
| a0779a2 | Clément Bœsch | 08 September 2013, 14:17:46 UTC | avformat/srtdec: skip initial random line breaks. I found a bunch of (recent) SRT files in the wild with 3 to 10 line breaks at the beginning. (cherry picked from commit cfcd55db164e0acc0c30b2cf084e6eebe9741d34) Signed-off-by: Alexander Strasser <eclipse7@gmx.net> | 16 September 2013, 19:39:33 UTC |
| b4f9001 | 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:15:49 UTC |
| 3a6fbb0 | 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:15:44 UTC |
| 6a782e2 | 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:39:16 UTC |
| 8cea63c | Clément Bœsch | 08 September 2013, 07:43:53 UTC | avformat/vobsub: fix seeking. (cherry picked from commit f8678dcef3c5b0ea82e898e1f419863409fa135f) | 10 September 2013, 19:39:12 UTC |
| 8f87e75 | 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:12:31 UTC |
| 06a927a | Carl Eugen Hoyos | 01 September 2013, 18:20:47 UTC | Read h264 headers from v4l2 to allow stream-copying. Fixes ticket #2882. Analyzed and tested by William C Bonner. (cherry picked from commit e337c9d56408dc00a15887309488a1ff5cb06ba3) | 05 September 2013, 20:55:33 UTC |
| 3c523bd | Paul B Mahol | 03 September 2013, 01:03:10 UTC | w64dec: fix end position of summarylist guid Noticed-by: James Almer Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 3e36dc8626f4721ea749286dae40169ee5cb7d04) | 05 September 2013, 20:55:25 UTC |
| ece54c7 | Paul B Mahol | 02 September 2013, 22:50:00 UTC | w64dec: fix skipping of unknown guids Regression since 14d50c1. Fixes #2932. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 79b70e47a463057a3a48353ee1dd58671c11f86c) | 05 September 2013, 20:55:15 UTC |
| 7eee79e | Carl Eugen Hoyos | 02 September 2013, 06:32:24 UTC | Avoid a deadlock when decoding wma. Fixes ticket #2925. (cherry picked from commit ec8a4841f7e81040f9a2757f23e70dff5e6b33a4) | 02 September 2013, 06:56:32 UTC |
| 458933f | Michael Niedermayer | 31 August 2013, 22:21:37 UTC | avformat/lxfdec: use a parser to parse video frame headers lxf needs a parser (or would need to set a few fields explicitly). Fixes Ticket2917 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8349be852be7f68fe0590584fd46c4d5f1c16b3d) | 01 September 2013, 08:01:25 UTC |
| 95d0baa | Michael Niedermayer | 01 September 2013, 01:40:20 UTC | avcodec/h264: set er.ref_count earlier Fixes Ticket2910 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 93cf7b01950b9d8e1646227752b522d0275d32df) | 01 September 2013, 08:01:22 UTC |
| 32cff0d | Michael Niedermayer | 31 August 2013, 01:08:25 UTC | avformat/avidec: match first index and first packet size=0 handling Fixes Ticket2861 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 227a0eb5a92409572f2cecde6137529b83e7d495) Conflicts: libavformat/avidec.c | 31 August 2013, 07:45:14 UTC |
| ddce97c | Michael Niedermayer | 30 August 2013, 21:14:32 UTC | avcodec/pngdsp: fix (un)signed type in end comparission Fixes out of array accesses Fixes Ticket2919 Found_by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 86736f59d6a527d8bc807d09b93f971c0fe0bb07) | 30 August 2013, 21:37:31 UTC |
| 26617b4 | Stefano Sabatini | 27 July 2013, 14:50:19 UTC | doc/codecs: fix dangling reference to codec-options chapter (cherry picked from commit b4bd21b7fe2ad8be59b16538448586814e5db65b) Signed-off-by: Timothy Gu <timothygu99@gmail.com> Conflicts: doc/codecs.texi | 26 August 2013, 23:21:34 UTC |
| b3fb651 | Michael Niedermayer | 26 August 2013, 22:26:24 UTC | update for 1.2.3 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 26 August 2013, 22:26:24 UTC |
| 2da5b69 | Stefano Sabatini | 05 April 2013, 23:43:01 UTC | doc/filters: review introductory example and explanation In particular, fix wrong vertical mirroring command, and clarify and extend explanation. Based on a patch by littlebat <dashing.meng@gmail.com>. Should fix trac ticket #2413. (cherry picked from commit 215ca864759a54f45265a51ac57dbfd75cb23da2) Signed-off-by: Timothy Gu <timothygu99@gmail.com> Conflicts: doc/filters.texi | 26 August 2013, 19:00:03 UTC |
| b23642a | Timothy Gu | 30 July 2013, 02:12:10 UTC | doc/encoders: add libxvid doc Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 6b255e5e70c72aa59ff7aed74b4ee976223eb140) Signed-off-by: Timothy Gu <timothygu99@gmail.com> Conflicts: doc/encoders.texi | 26 August 2013, 18:29:32 UTC |
| eae4dfd | Timothy Gu | 22 July 2013, 23:44:11 UTC | doc/encoders: partially rewrite and reformat libx264 docs Format is based on the thread: "[PATCH] doc/encoders: Add libopus encoder doc" (06-28-2013) http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/165368/ Also merge the two option sections (Mapping and Private options). Patch partially edited by Stefano Sabatini. Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 11cb697501edf6447a718d6194f0e63ec2310d39) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 18:29:16 UTC |
| 6fb2c03 | Timothy Gu | 06 July 2013, 03:37:18 UTC | doc/encoders: add libopus encoder doc Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 561e05136f1cbe28a79af1940aa137f70281eef4) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 18:29:14 UTC |
| 1d6b261 | Timothy Gu | 03 July 2013, 02:32:27 UTC | doc/muxers: Add AIFF doc Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 4ec46b1160eb549a551823c168905b43922add31) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 18:28:25 UTC |
| 02f1ae5 | Timothy Gu | 28 June 2013, 02:07:32 UTC | doc/decoders: document libopus decoder Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 7eb5288f17aad81d5bd1b4d3d46533e457df262c) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 18:28:25 UTC |
| aaac34f | Timothy Gu | 28 June 2013, 01:50:54 UTC | doc/encoders: alphabetically list the encoders Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 934df3b0375743ae2b03168a4174edb9f88a6889) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 18:27:39 UTC |
| 7858d26 | Timothy Gu | 21 June 2013, 16:17:21 UTC | doc/decoders: Add libopencore-amrwb decoder doc Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 83647ace735d1707d4b28345ef77fefe525ea52e) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 18:27:08 UTC |
| f85c442 | Timothy Gu | 21 June 2013, 03:08:35 UTC | doc/decoders: Document libopencore-amrnb decoder Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b43860ee0c27279f2fa020ea965c03d359f8f45c) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 18:27:08 UTC |
| 025e286 | Timothy Gu | 20 June 2013, 23:33:49 UTC | doc/decoders: Document libilbc decoder Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8cdea50f6eee1271e24ff0c9590522f8323e87fe) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 18:27:08 UTC |
| 79ec45a | Timothy Gu | 18 June 2013, 23:01:43 UTC | doc/decoders: Document libgsm decoder Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c16496c3770fa083472ab86146c18dc96c1feea7) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 18:27:08 UTC |
| 09653c5 | Timothy Gu | 18 June 2013, 00:38:38 UTC | doc/encoders: Add libopencore-amrnb doc Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9ead06057acfcc43bcb99a63a7c58543007b2847) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 18:27:01 UTC |
| c788713 | Timothy Gu | 18 June 2013, 00:42:08 UTC | doc/decoders: Document libcelt Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e3580449221c79cf611995dc7e2fcb61dd867d4c) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 16:26:22 UTC |
| f637fa5 | Timothy Gu | 11 June 2013, 23:52:12 UTC | doc/general: Make the license status of the Android libraries clearer Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6fe419bf73146655961a373c734e9e4d8826c835) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 16:25:53 UTC |
| dc1881e | Timothy Gu | 11 June 2013, 23:58:01 UTC | doc/encoders: Add libvo-amrwbenc doc Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0ec65aa1046a4417d5c7dfcf8faeecde60e3fe00) Signed-off-by: Timothy Gu <timothygu99@gmail.com> Conflicts: doc/encoders.texi | 26 August 2013, 16:20:30 UTC |
| 24187a9 | Timothy Gu | 08 June 2013, 02:54:23 UTC | doc/encoders: Add libvo-aacenc doc Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ba7cb4807f050c401f8fd7ef1d1065b138358135) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 16:19:42 UTC |
| c87f3c3 | Timothy Gu | 01 June 2013, 23:26:03 UTC | doc/encoders: add documentation for libtwolame (cherry picked from commit ea038b996d5662702b2247a6aa919dee1cebc0be) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 16:19:35 UTC |
| 8f07c09 | Timothy Gu | 24 May 2013, 19:28:48 UTC | doc/encoders: Add documentation for libmp3lame Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4703a345fb41b14fe28f7e6bf7f60bb2213aa9e0) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 16:19:29 UTC |
| 8e3581a | Timothy Gu | 31 March 2013, 10:20:17 UTC | doc/filters: fix width/height typo in crop filter. Signed-off-by: Clément Bœsch <ubitux@gmail.com> (cherry picked from commit 874173002e9ea7e3504197c2f55a565f78cddf61) Signed-off-by: Timothy Gu <timothygu99@gmail.com> | 26 August 2013, 16:19:19 UTC |
| 5d3cd04 | Michael Niedermayer | 18 August 2013, 00:20:54 UTC | avformat/matroskadec: check out_samplerate before using it in av_rescale() Prevent assertion failure with damaged input Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 338f8b2eaf36f078eb5cc26ac10e651dc4c48243) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 26 August 2013, 02:51:06 UTC |
| 9865f19 | James Almer | 17 August 2013, 17:48:33 UTC | matroskadec: Improve TTA duration calculation Calculate the duration as accurately as possible to improve decoding of samples where the last frame is smaller than the rest. Signed-off-by: James Almer <jamrial@gmail.com> Approved-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit af248fa1174200acb537a6ab1198bb2fed38e884) | 26 August 2013, 02:51:06 UTC |
| 90ed770 | Michael Niedermayer | 17 July 2013, 11:30:36 UTC | matroskaenc: simplify mkv_check_tag() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 066111bf19518a9f4d836991b34dbfc5ab72a41a) | 26 August 2013, 02:51:06 UTC |
| f9fa321 | James Almer | 17 July 2013, 06:10:16 UTC | lavf/matroskaenc: Check for valid metadata before creating tags Tags must have at least one SimpleTag element to be spec conformant. Updated lavf-mkv and seek-lavf-mkv FATE references as the tests were affected by this. Fixes ticket #2785 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 088ed5314694031e07e02e9d364c9d486a60e704) | 26 August 2013, 02:51:06 UTC |
| a0e328d | Michael Niedermayer | 20 May 2013, 02:00:30 UTC | matroska_read_seek: Fix used streams for subtitle index compensation Might fix Ticket1907 (I have no testcase so i cant test) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4758e32a6c48044f77102a49110c79b4f338f648) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 26 August 2013, 02:51:06 UTC |
| 848e5cf | Michael Niedermayer | 24 August 2013, 01:19:40 UTC | jpeg2000: check log2_cblk dimensions Fixes out of array access Fixes Ticket2895 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9a271a9368eaabf99e6c2046103acb33957e63b7) Conflicts: libavcodec/jpeg2000dec.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 25 August 2013, 18:23:53 UTC |
| 9d8795e | Michael Niedermayer | 21 August 2013, 23:07:32 UTC | avcodec/rpza: Perform pointer advance and checks before using the pointers Fixes out of array accesses Fixes Ticket2850 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3819db745da2ac7fb3faacb116788c32f4753f34) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 25 August 2013, 17:50:54 UTC |
| 64d440a | Michael Niedermayer | 20 August 2013, 21:18:48 UTC | avcodec/flashsv: check diff_start/height Fixes out of array accesses Fixes Ticket2844 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 880c73cd76109697447fbfbaa8e5ee5683309446) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 25 August 2013, 17:50:54 UTC |
| 42586c8 | Michael Niedermayer | 09 August 2013, 11:23:10 UTC | avformat/paf: Fix integer overflow and out of array read Found-by: Laurent Butti <laurentb@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f58cd2867a8af2eed13acdd21d067b48249b14a1) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 25 August 2013, 17:50:54 UTC |
| 64d362f | Michael Niedermayer | 03 August 2013, 16:54:43 UTC | avfilter: fix plane validity checks Fixes out of array accesses Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e43a0a232dbf6d3c161823c2e07c52e76227a1bc) Conflicts: libavfilter/vf_delogo.c libavfilter/vf_fieldmatch.c libavfilter/vf_fieldorder.c libavfilter/vf_hflip.c libavfilter/vf_kerndeint.c libavfilter/vf_lut.c libavfilter/vf_pad.c libavfilter/vf_showinfo.c libavfilter/vf_vignette.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 25 August 2013, 17:50:54 UTC |
| c55a09a | Michael Niedermayer | 20 August 2013, 14:56:51 UTC | swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output Fixes Ticket2859 Note, testcases related to the downmix channels are welcome. (id like to make sure this is working correctly now, as obviously it didnt work before ...) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c56d4dab039b352961cca298d753b04e2f2fd990) | 20 August 2013, 16:42:44 UTC |
| a944044 | Michael Niedermayer | 20 August 2013, 14:49:31 UTC | swr: clean layouts before checking sanity Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6dfffe92004dfd8c79d18791f28a2b1c7e387845) | 20 August 2013, 16:42:40 UTC |
| 364495a | Michael Niedermayer | 20 August 2013, 11:45:20 UTC | movenc: ilbc needs audio_vbr set. Without this the block_align or bitrate value is not available to the decoder Fixes Ticket2858 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3d64845600c6486a2706b118a81805f3bf4d3db5) | 20 August 2013, 16:42:13 UTC |
| f9c8726 | Michael Niedermayer | 29 July 2013, 18:43:45 UTC | avcodec/kmvc: fix MV checks Fixes Ticket2813 Fixes regression since 70b5583 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3cd8aaa2b2e78faf039691e1c31ff4f8d94e3bc6) | 31 July 2013, 00:56:15 UTC |
| 9f2d731 | Paul B Mahol | 28 July 2013, 22:00:42 UTC | Revert "pnm: remove nonsense code" Breaks decoding pgms with 255 < maxval < 65535. Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>. This reverts commit a0348d0966a81a66f3a1bf061576b24d5296b933. (cherry picked from commit 768e40b451a459fefaceed6b1b3d6e70c93596ac) | 28 July 2013, 22:02:59 UTC |
| 930d035 | Michael Niedermayer | 27 July 2013, 22:24:46 UTC | update for 1.2.2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 27 July 2013, 22:24:46 UTC |
| 875649b | Michael Niedermayer | 26 July 2013, 02:09:30 UTC | avformat/dtsdec: Improve probe, reject things looking like analog signals Fixes Ticket2810 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6663205338f57eedb2392263dde48e2717c6e980) Conflicts: libavformat/dtsdec.c | 26 July 2013, 10:16:29 UTC |
| 7012707 | Rémi Denis-Courmont | 24 July 2013, 16:50:43 UTC | mpeg12: Ignore slice threading if hwaccel is active Slice threading does not work with hardware acceleration, as decoding is per-picture. This fixes Bugzilla #542. Signed-off-by: Diego Biurrun <diego@biurrun.de> (cherry picked from commit 93a51984a27f3ba84d4e6f13d0c704ee9891603e) Conflicts: libavcodec/mpeg12dec.c | 26 July 2013, 09:43:38 UTC |
| d83ab33 | Michael Niedermayer | 19 July 2013, 02:19:23 UTC | swscale/input: fix 16bit gbrp input Fixes Ticket2793 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a4b55bbb6f8ba055bba1493f6872792503e47563) Conflicts: libswscale/input.c | 19 July 2013, 12:59:58 UTC |
| 06190d7 | Michael Niedermayer | 15 July 2013, 15:13:45 UTC | avformat/matroskadec: Detect conflicting sample rate/default_duration Fixes Ticket2508 Thanks-to: Moritz Bunkus Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6158a3bcdf52fafc1d9ae9eb358a56c614b23aa3) | 16 July 2013, 09:47:52 UTC |
| c9ea1f7 | Michael Niedermayer | 14 July 2013, 23:20:38 UTC | Merge remote-tracking branch 'jamrial/release/1.2' into release/1.2 * jamrial/release/1.2: oggparseskeleton: avoid header parsing failure oggparseskeleton: Replace avpriv_report_missing_feature() with a normal av_log() call oggparseskeleton: Fix fisbone header parsing Merged-by: Michael Niedermayer <michaelni@gmx.at> | 14 July 2013, 23:20:44 UTC |
| 47de8cc | Michael Niedermayer | 10 July 2013, 14:39:10 UTC | avfilter/af_earwax: Fix out of array accesses on odd packets Found-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0a3a0edd52b98aec27d1b8c63c85cb52ff46d40e) Conflicts: libavfilter/af_earwax.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 10 July 2013, 17:07:10 UTC |
| 72c1de6 | Michael Niedermayer | 10 July 2013, 14:21:33 UTC | avcodec/qdm2: initialize sign_bits Fixes non deterministic output Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8f09957194b8d7a3ea909647e22eaf1389b6f5c4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 10 July 2013, 17:05:23 UTC |
| 5e3e67f | Michael Niedermayer | 10 July 2013, 14:18:52 UTC | avcodec/qdm2: store bits in an integer instead of float variable Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fbe159e85079f1f94a7201dc210b155dba7ff4a6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 10 July 2013, 17:05:21 UTC |
| 221bbd0 | Luca Barbato | 08 July 2013, 23:03:13 UTC | atrac3: fix error handling decode_tonal_components returns a proper AVERROR. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5eaed6d33689cc6f6e7c07463ede6b387b08afc4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 10 July 2013, 16:56:45 UTC |
| fffc931 | Luca Barbato | 30 June 2013, 07:57:56 UTC | indeo: Properly forward the error codes If the tile data size does not match the buffer size it did not return an AVERROR_INVALIDDATA causing futher corruption later. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind (cherry picked from commit 7388c0c58601477db076e2e74e8b11f8a644384a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 10 July 2013, 16:51:42 UTC |
| 9a87ba0 | Michael Niedermayer | 29 June 2013, 17:46:33 UTC | update all trac links to use the trac subdomain Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 10 July 2013, 16:46:35 UTC |
| d8538a1 | Dale Curtis | 22 May 2013, 22:17:08 UTC | avformat/utils: Keep internal and external av_read_frame() packets in sync. Otherwise, during error conditions, the caller will be left with dangling pointers to a destructed packet => boom. BUG=242786 TEST=ffmpeg_regression_tests Commit slightly simplified by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c54a1565f512858ccfa70392f40f11c098bc1b63) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 10 July 2013, 16:46:35 UTC |
| 6cb33e0 | Michael Niedermayer | 08 July 2013, 19:46:20 UTC | mpeg12dec: avoid reinitialization on PS changes when possible. Fixes Ticket2574 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 970c8df73528659925819dec31c4c8c0887f0321) Conflicts: libavcodec/mpeg12dec.c | 08 July 2013, 22:21:03 UTC |
| 2e75c45 | Michael Niedermayer | 07 July 2013, 11:15:32 UTC | mp3dec: detect CBR and use CBR axiom to seek This should also work reasonable with truncated and growing mp3s. Fixes Ticket2590 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e096283ea55bc36a637b47329e19ddb26fb1440b) Conflicts: libavformat/mp3dec.c | 08 July 2013, 22:20:37 UTC |
| ba4cb43 | Michael Niedermayer | 06 July 2013, 21:53:19 UTC | oggparseskeleton: avoid header parsing failure Based on description by James Almer and the xiph wiki Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9a6e814be7c052deb34a8f585176d053f4c187c1) | 08 July 2013, 00:42:01 UTC |
| dc73774 | James Almer | 06 July 2013, 07:34:13 UTC | oggparseskeleton: Replace avpriv_report_missing_feature() with a normal av_log() call since there should not be more than one fisbone for a given stream. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 63d7684fefcfa9de1a04b43471f876e882ba7aac) Conflicts: libavformat/oggparseskeleton.c | 08 July 2013, 00:41:37 UTC |
| ce11d94 | James Almer | 06 July 2013, 07:34:13 UTC | oggparseskeleton: Fix fisbone header parsing start_granule should be applied to the stream referenced in the fisbone packet, not to the Skeleton stream. This was broken in d1f05dd18375f2f8e68372edee11436927e43ba8 and produced bogus warnings about multiple fisbone in the same stream on files with more than one stream. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3960992f0abf8e28acada220c79fb754d67298ba) | 08 July 2013, 00:41:16 UTC |
| 430ef8a | Michael Niedermayer | 17 June 2013, 20:03:36 UTC | mmsh: dont close context on seeking failure Fixes Ticket2581 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b4579a29c75e2968ede2ad002dd4a495dbfc883d) | 07 July 2013, 19:32:19 UTC |
| 627772d | Michael Niedermayer | 07 July 2013, 00:42:40 UTC | avformat/mov: Fix duration of fragmented mov Fixes Ticket2757 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit dc2a13aa802fc691c25d5e0194818831058316ee) | 07 July 2013, 16:25:25 UTC |
| 5ce57e0 | Michael Niedermayer | 06 July 2013, 23:29:48 UTC | libavcodec/x86/mpegvideo: Move mmx functions under HAVE_MMX_INLINE should fix ticket2755 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 707b2135fda3687a6eeb91411f801e437f633f30) | 07 July 2013, 16:24:18 UTC |
| 5effd65 | Michael Niedermayer | 06 July 2013, 23:29:18 UTC | avcodec/x86/vp3dsp_init: move mmx functions under HAVE_MMX_INLINE Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit abce6dfd9ecea358f8def5040f60fcbe7f89e970) | 07 July 2013, 16:23:59 UTC |
| cb340ec | Michael Niedermayer | 05 July 2013, 01:27:07 UTC | mpegts: only reopen pmt_cb filter if its different from the previous. Fixes Ticket2632 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b009267910df10c004b5f340a090d45da29089a0) | 07 July 2013, 16:20:18 UTC |
| b88bea1 | Michael Niedermayer | 01 July 2013, 21:38:08 UTC | rmdec: Pass AVIOContext to rm_read_metadata() Fix null pointer dereference Fixes Ticket2588 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bf87908cd8da31e8f8fe75c06577170928ea70a8) | 07 July 2013, 16:15:57 UTC |
| 9903656 | Michael Niedermayer | 01 July 2013, 18:48:38 UTC | avcodec/x86/dsputil_init: only use xvid idct for lowres=0 Fixes crash Fixes Ticket2714 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b791a0831b0a027e7ba4eb6961cc0180472ac603) Conflicts: libavcodec/x86/dsputil_init.c | 07 July 2013, 16:14:55 UTC |
| fcc6460 | Nigel Touati-Evans | 27 June 2013, 11:28:43 UTC | Fix copying extradata to codec in mxfdec.c The code that copies any extradata from the MXFDescriptor to the codec does not set the size, which it should otherwise the copied data is useless. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 42bd0cd21ae68abef4436cc97d67f592be38d3e3) Conflicts: libavformat/mxfdec.c | 27 June 2013, 12:15:12 UTC |
| 1065d41 | Hendrik Leppkes | 15 June 2013, 20:46:01 UTC | mathops/x86: work around inline asm miscompilation with GCC 4.8.1 The volatile is not required here, and prevents a miscompilation with GCC 4.8.1 when building on x86 with --cpu=i686 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 659df32a9d8984081ccd54adc3aee7daeb33388d) | 24 June 2013, 06:44:24 UTC |
| fbb1af3 | Michael Niedermayer | 20 June 2013, 18:20:56 UTC | avdevice/x11grab: allocate just one Cursor Fixes resource leak and Ticket2450 Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1ee8fadb811f3b1ef370c7d6c7bf62088f1cc954) | 21 June 2013, 14:45:36 UTC |
| 073bde2 | Michael Niedermayer | 20 June 2013, 19:49:02 UTC | avformat/iff: Byte seek is unsupported Fixes Ticket2194 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 03cd3bec6e66a49bcec138d72bac97cb8a64d246) | 20 June 2013, 23:11:56 UTC |
| e4bb67b | Michael Niedermayer | 20 June 2013, 23:11:45 UTC | avformat/libmodplug: Reduce the probe score for small input This ensures that theres enough data for mpeg_probe() to recognize mpeg-ps Fixes Ticket2583 Based on code by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c605adbf562fbf535e83ae427bb681bc45e440c8) | 20 June 2013, 23:11:45 UTC |
| 59549b5 | Carl Eugen Hoyos | 19 June 2013, 14:31:10 UTC | Autodetect idcin only if audio properties allow decoding. Fixes ticket #2688. (cherry picked from commit 06bede95fcea47d2e51e8ff248c15311f335b898) | 19 June 2013, 21:45:18 UTC |
