| 5a0a156 | Michael Niedermayer | 16 January 2014, 01:53:32 UTC | cmdutils: update year Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 16 January 2014, 01:53:32 UTC |
| 884094d | Michael Niedermayer | 16 January 2014, 01:52:53 UTC | Update for 1.2.5 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 16 January 2014, 01:52:53 UTC |
| db20610 | Michael Niedermayer | 04 May 2013, 14:49:47 UTC | wmaprodec: Fix null pointer dereference in decode_frame() Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c7a7605656633e52ade8a5d32a7c2497b37faef8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 16 January 2014, 00:58:13 UTC |
| 15a7364 | Michael Niedermayer | 05 May 2013, 23:37:34 UTC | h264: check mb_width/height Fixes inconsistency that leads to out of array accesses with threads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5a9e3760495e8678ae87314670e3d9d5a1792c8d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:52:56 UTC |
| c8b90c7 | Michael Niedermayer | 04 May 2013, 18:21:47 UTC | h264: Always decode MMCOs into temprary array When decoding succeeded the array is copied into the permanent one. This prevents inconsistencies Fixes assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c40f51e15b91898e5c69fca7c8c67e3da6624dd4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:52:56 UTC |
| 97978b7 | Michael Niedermayer | 30 March 2013, 18:10:04 UTC | h264: move the default_ref_list_done check down after its inputs have been written Fixes out of array read Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 11c3381ce3c353a4dadf9def6232e7604b0c5d2b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:52:56 UTC |
| 3f2efac | Michael Niedermayer | 30 March 2013, 15:04:07 UTC | h264: Move slice_table clean out of frame_start Fixes inconsistency ultimately leading to an out of array read Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 746016598d1885afd1fee976b6d315ed7eeefa68) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:52:56 UTC |
| b9058f5 | Michael Niedermayer | 28 March 2013, 20:09:01 UTC | h264_refs: Check for attempts to assign pictures to short & long. Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 92002db3eb437414281ad4fb6e84e34862f7fc92) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:49:11 UTC |
| 47faf34 | Michael Niedermayer | 28 March 2013, 02:16:01 UTC | h264_cavlc: fix assertion failure due to reading too long vlc Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 10ece44d0948b44b062d09319052d09d14f7bfdb) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:48:58 UTC |
| 3d1e4b7 | Michael Niedermayer | 02 January 2014, 16:46:21 UTC | avcodec/aacps: fix number of bands used with ipd/opd Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f861d16355f_1664_File1_fixed.aac Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6433b393ba2b1b410ff18e386f84781a760549f5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:47:25 UTC |
| a2bea0d | Michael Niedermayer | 29 March 2013, 19:58:42 UTC | aacps: correct opdipd code to match spec This fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 66e9716a36105f69b9f076b0fec3ec2551c7e3b7) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:47:18 UTC |
| 483b201 | Michael Niedermayer | 02 May 2013, 00:16:41 UTC | avcodec/ansi: Fix right/bottom end checks Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6021615bbe393381f23b34a7cd0dcfd1a42687ba) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:45:22 UTC |
| 271f5d6 | Michael Niedermayer | 02 May 2013, 00:15:03 UTC | avcodec/ansi: Check x/y This prevents out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e91fd754c63de7fd3cb7fdea8974166db362e387) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:45:07 UTC |
| dee327b | Michael Niedermayer | 22 May 2013, 15:39:22 UTC | shorten: fix "off by padding" bug Fixes array overread Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ad22767cb61cdc75541b21154d65fd1ad6351025) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:42:23 UTC |
| e438fd3 | Michael Niedermayer | 13 May 2013, 16:09:04 UTC | avcodec/lcldec: Check that dimensions are a multiple of the subsample factors Other dimensions would not work correctly currently, also ask for a sample for files that fail this check. This fixes an integer overflow leading to out of array accesses. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1e00bbb10cbde3da03a1e744265ce6def9ae4c56) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 3d380ff | Michael Niedermayer | 07 May 2013, 20:26:22 UTC | avformat/vqf: check number of channels before use. Fixes division by zero Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a527e692592b7eef69430cc866bb96231526316c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 84b1003 | Michael Niedermayer | 07 May 2013, 18:33:33 UTC | dxa: check vectors of 2x2 motion blocks Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ead590c2561980f2afda38a662364659577dca38) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 7855083 | Michael Niedermayer | 07 May 2013, 18:18:41 UTC | dxa: check vectors of 4x4 motion blocks Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f96e0eb2387f8da7b8177f8f22969853dc648ca6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| ca7f64e | Michael Niedermayer | 07 May 2013, 17:57:10 UTC | shorten: allocate space for padding Fixes array overread Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 89d998f1c1eddac3a1256e28ac00ccfdf4d3edd1) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 2b26f8c | Michael Niedermayer | 04 May 2013, 00:47:58 UTC | evrcdec: fix sign error The specification wants round(abs(x))) * sign(x) which is equivakent to round(x) Fixes out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f18d2dff1194b34b79dc7641aafe54d1df349e40) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 6e3697b | Michael Niedermayer | 03 May 2013, 21:16:54 UTC | eamad: Check against minimum supported dimensions Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e756635964ed3aa1ee997465f9b46143bcb5d894) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| c935016 | Michael Niedermayer | 17 April 2013, 22:52:48 UTC | xan: Check for overlapping copies No valid samples i found use such copies Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bdfe60c769f4d4e71a360fe02f06cdb9c039cf35) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| bb6f466 | Michael Niedermayer | 18 April 2013, 00:52:41 UTC | avcodec/bitstream: check codes in ff_init_vlc_sparse() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6998af4a40e67b5f0bfb769b7749f38a92eb2819) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 08a3195 | Michael Niedermayer | 18 April 2013, 00:47:10 UTC | avcodec/bitstream: Check bits in ff_init_vlc_sparse() Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fb3e3808aed843b21dd70a70bdbc4b9f7de6a00b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| d1da1c8 | Michael Niedermayer | 19 April 2013, 12:46:31 UTC | avcodec/mpegvideo_motion: Use a field from the current frame if the last is unavailable in DMV & 16x8 Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 42bcc4082d644342171216fcf597cde75421a4d7) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 8ded373 | Michael Niedermayer | 16 April 2013, 14:41:21 UTC | avcodec/c93: Check for block overlap. Fixes overlapping memcpy() Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6b657ac7889738b9ab38924cca4e7c418f6fbc38) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| a2186a8 | Michael Niedermayer | 18 April 2013, 17:53:00 UTC | avcodec/mpegvideo_motion: Check P field references If a reference is unavailable use a field from the current picture Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 23daee0dcc57b647b9d62d4c905e94acf0c6b8e0) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| a92b73d | Michael Niedermayer | 18 April 2013, 15:54:54 UTC | svq3: use memmove to avoid overlap in memcpy. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4c8ce750abaa783109630d41ca7dde5de34f6197) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| ab38b39 | Michael Niedermayer | 18 April 2013, 14:19:10 UTC | evrcdec: use memmove() instead of memcpy() when regions can overlap. This occurs also with valid files. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5ae484e350e4f1b20b31802dac59ca3519627c0a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 5dde8ba | Michael Niedermayer | 06 December 2013, 22:30:34 UTC | avutil/log: skip IO calls on empty strings These occur when no context is set for example, thus they are common Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a044a183a3fb90b20a8deaa3ea1158510bcdd420) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| b841869 | Michael Niedermayer | 06 December 2013, 15:49:35 UTC | avcodec/error_resilience: check that er is supported before attempting to read the status of the previous slice Fixes incorrectly set error_occured and improves speed Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 90539cea336fd513c47295a03c164cb4a851166f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 3488e9e | Michael Niedermayer | 06 December 2013, 15:49:00 UTC | avcodec/error_resilience: factor er_supported() check out Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit afb18c55783362546b5e512ce01b7fe7bf5744d9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 5a8d78a | Paul B Mahol | 15 November 2013, 01:09:06 UTC | avcodec/libopusenc: change default frame duration to 20 ms 20 ms is used by libopus encoder. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 74906d3727ec3bd9b7b28dfa7a98ff6e8cf8b6d7) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| dea7f1c | Michael Niedermayer | 21 November 2013, 01:32:37 UTC | avcodec: move end zeroing code from av_packet_split_side_data() to avcodec_decode_subtitle2() This code changes the input packet, which is read only and can in rare circumstances lead to decoder errors. (i run into one of these in the audio decoder, which corrupted the packet during av_find_stream_info() so that actual decoding that single packet failed later) Until a better fix is implemented, this commit limits the problem. A better fix might be to make the subtitle decoders not depend on data[size] = 0 or to copy their input when this is not the case. (cherry picked from commit 01923bab98506b1e98b4cbf08419364ce6ffea6d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| c7027ae | Michael Niedermayer | 14 November 2013, 10:27:45 UTC | h264: Do not treat the initial frame special in handling of frame gaps The not handling of frame gaps has lead to the lack of a dummy reference frame, which has lead to the failure of decode_slice_header() which has lead to one SEI recovery message being skiped which had introduced a slightly suboptimal recovery point for at least 1 h264 file compared to JM. Found-by: Carl & BugMaster Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9e5ef1c5c37208326c59d642e2dc7afd3f10b09b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 971b137 | Michael Niedermayer | 31 October 2013, 01:26:07 UTC | avformat/thp: force moving forward Fixes infinite loop Fixes Ticket3098 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6c4b87d3d6ae08a6da16b4616626b4d2a726afbf) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| d0ed672 | Michael Niedermayer | 31 October 2013, 01:19:40 UTC | avformat/thp: fix variable types to avoid overflows Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2b1056e4e27b046af3777e8bd65a5145abff878f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 751e684 | Michael Niedermayer | 30 October 2013, 22:27:28 UTC | avcodec/jpeglsdec: check err value for ls_get_code_runterm() Fixes infinite loop Fixes Ticket3086 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cc0e47b55096361723b364afa43b79a3f5619cdc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 803ca5c | Michael Niedermayer | 20 October 2013, 16:38:48 UTC | avutil/opt: initialize ret Fixes CID1108610 Fixes use of uninitialized variable Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2d8ccf0adcae09cb9e14b01cfe20e4d77c3bbf5d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 252002a | Michael Niedermayer | 19 October 2013, 15:52:47 UTC | avcodec/utils: add some saftey checks to add_metadata_from_side_data() This fixes potential overreads with crafted files. Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 838f461b0716393a1b5c70efd03de1e8bc197380) Conflicts: libavcodec/utils.c | 15 January 2014, 23:35:12 UTC |
| d805a51 | Michael Niedermayer | 19 October 2013, 15:45:54 UTC | avcodec/avpacket/av_packet_split_side_data: ensure that side data padding is initialized Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 240fd8c96f59ebe9dcfc4152a1086cd3f63400c0) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 45dd7df | 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 | 15 January 2014, 23:35:12 UTC |
| da82be0 | 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> | 15 January 2014, 23:35:12 UTC |
| b8b77ae | Paul B Mahol | 09 September 2013, 10:44:27 UTC | avcodec/ffv1dec: fix format detection Fixes crash with carefuly designed files. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit a27227d401adf12534dc7a26d72e43e2f35f8944) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 15 January 2014, 23:35:12 UTC |
| 30147f1 | Carl Eugen Hoyos | 15 January 2014, 22:37:47 UTC | Do not read mkv audio bit_depth if bits_per_coded_sample is already set. This allows decoding broken mkv files containing G.726 audio. (cherry picked from commit 11329370770e5c982deece7d4eb4f2e95e725332) | 15 January 2014, 23:28:49 UTC |
| d6a705d | Carl Eugen Hoyos | 15 January 2014, 22:35:22 UTC | Do not set mkv bit_depth to av_get_bytes_per_sample() for G.726. The value is wrong and leads to broken files. (cherry picked from commit 565102dcac4959da60e6b1528dc31315d21194ca) | 15 January 2014, 23:28:15 UTC |
| e24b33c | 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:45:45 UTC |
| 6f7fd2f | 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 | 08 January 2014, 09:24:03 UTC |
| f974c54 | 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) | 08 January 2014, 09:22:31 UTC |
| 71b3235 | 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) | 05 January 2014, 16:27:29 UTC |
| dcd1acc | Alexander Strasser | 06 December 2013, 16:20:26 UTC | configure: Special case libfreetype test Include the freetype header, in-directly through a macro, like it is done in the drawtext filter. Do not break if the header is moved. Unfortunately the drawtext filter included the file where the include macros are defined in a wrong way. This is not needed and breaks the build. Remove that #include line too. (cherry picked from commit cea5812fa723c08b89d929eeba73462e05de2973) Signed-off-by: Alexander Strasser <eclipse7@gmx.net> Conflicts: configure | 29 December 2013, 10:37:29 UTC |
| 5c502e5 | 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:06:42 UTC |
| fa45fee | Peter Ross | 23 December 2013, 09:37:28 UTC | wtvenc: populate VIDEOINFOHEADER2 Fixes ticket #2835. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6da21c1f8190d674fd1e5619bb148c1bbab8ca3c) Conflicts: tests/ref/lavf/wtv tests/ref/seek/lavf-wtv | 24 December 2013, 06:59:01 UTC |
| 9f3135b | Peter Ross | 23 December 2013, 09:37:13 UTC | avformat/riffenc: indent Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f93b0abe4041b75f0dbb590ee932b37a07662856) Conflicts: libavformat/riffenc.c | 24 December 2013, 06:53:52 UTC |
| 7ba102d | Peter Ross | 23 December 2013, 09:37:00 UTC | riffenc: add option to ff_put_bmp_header to ignore extradata Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fcbb94712d9873a37cdc8b526e368154b5982186) Conflicts: libavformat/riffenc.c | 24 December 2013, 06:52:36 UTC |
| 3e65caf | 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) | 21 December 2013, 08:55:05 UTC |
| af7cbdf | Michael Niedermayer | 15 December 2013, 13:13:55 UTC | swscale/utils: check chroma width for fast bilinear scaler Fixes artifacts where fast bilinear was used for downscaling chroma Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 037fc3b054b10aee0f11fdbe835e5dffa8e95b37) | 16 December 2013, 01:26:24 UTC |
| 414b377 | Michael Niedermayer | 15 December 2013, 13:10:02 UTC | swscale/utils: remove useless () Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 554e913fd7acc9da02ddac2c5ce9487f7f633c92) | 16 December 2013, 01:26:22 UTC |
| 86d4d4b | 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:36:54 UTC |
| 14f31df | Michael Niedermayer | 02 April 2013, 16:08:12 UTC | ffmpeg: Fix forcing of the framerate for stream copy on input Fixes Ticket2211 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 356363c89830585b0a1476ccc16d79158260617c) | 29 November 2013, 10:27:12 UTC |
| d04e788 | 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, 13:49:08 UTC |
| 25c67b2 | 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, 13:48:53 UTC |
| fd8af75 | Michael Niedermayer | 30 October 2013, 22:56:52 UTC | avcodec/bink: fix seeking to frame 0 Fixes Ticket3088 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cb52d6da0a9c88c584a38a9a7a94825565854b7e) Conflicts: libavcodec/bink.c | 31 October 2013, 00:01:52 UTC |
| 93d720b | 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:43:26 UTC |
| 720e2d4 | 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:42:40 UTC |
| 9195ef6 | 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:06:43 UTC |
| 833dce3 | 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:05:12 UTC |
| a8b6721 | 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:03:53 UTC |
| 1fe734f | 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) | 24 October 2013, 09:07:37 UTC |
| 311e58e | mrlika | 02 September 2013, 12:10:22 UTC | lavd/v4l2: do not fail when VIDIOC_ENUMSTD returns EINVAL without a valid match With some (buggy) drivers, the VIDIOC_G_STD ioctl returns a std_id that cannot be matched with any of the enumerated v4l2_standard structures (for example std_id = 0 or std_id = 0xffffff). Do not fail when we reach the end of the enumeration without a valid match. Fixes ticket #2370 Note: This commit message has been modified by Giorgio Vazzana, the original commit message was: "Fixed regression for mandatory VIDIOC_ENUMSTD support by v4l2" Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ed72542539fb61dc3a6d6280d8a6a956ac04a071) | 24 October 2013, 09:02:35 UTC |
| 970109d | 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:01:33 UTC |
| eff0bf7 | 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, 08:57:14 UTC |
| 6559bb8 | 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, 08:54:46 UTC |
| 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 |
