| b48cf54 | Michael Niedermayer | 06 February 2013, 03:03:52 UTC | ffmpeg: do not call exit from exit_program() This should fix Ticket2116 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 127ff88639e78b9d16fecb973c41b86a843b4fa7) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 06 February 2013, 03:15:48 UTC |
| 5f3fa5f | Michael Niedermayer | 06 February 2013, 00:25:52 UTC | ffmpeg: dont allow -flags to override -pass Fixes Ticket2154 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ccf9dd00da055e94117b56cead4af80ff331b00e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 06 February 2013, 01:03:05 UTC |
| 0e1bb99 | Michael Niedermayer | 05 February 2013, 16:05:02 UTC | update for 1.1.2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 06 February 2013, 01:02:35 UTC |
| d2c1a8d | Michael Niedermayer | 05 February 2013, 17:52:07 UTC | ljpegenc: allocate needed scratch-buffer Fixes null pointer dereference Fixes Ticket2207 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c2dd5a18b27bb33d871d41fbed9104f3a68d68fe) | 05 February 2013, 23:11:11 UTC |
| 5a97a52 | Michael Niedermayer | 05 February 2013, 17:31:27 UTC | riff: fix infinite loop Fixes Ticket2241 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a8343bfb6a3f00777943b94ff2969422f578f246) | 05 February 2013, 23:10:05 UTC |
| f6b5092 | Michael Niedermayer | 05 February 2013, 21:57:35 UTC | dvenc: dont fail hard if the timecode is invalid Instead just dont store the timecode Fixes Ticket2187 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f0eacbc760c8b27c2064cea5395e32971853c73c) | 05 February 2013, 23:09:03 UTC |
| a55c274 | Michael Niedermayer | 05 February 2013, 20:54:02 UTC | movtextenc: fix pointer messup and out of array accesses Fixes Ticket2213 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b0635e2fcf80717dd618ef75d3317d62ed85c300) | 05 February 2013, 23:07:02 UTC |
| eaa9d2c | Michael Niedermayer | 02 February 2013, 20:11:54 UTC | h264: skip error concealment when SPS and slices are mismatching Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 695af8eed642ff0104834495652d1ee784a4c14d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 February 2013, 15:53:12 UTC |
| d3bec24 | Michael Niedermayer | 20 January 2013, 14:03:13 UTC | h264: Only apply error concealment if theres a frame Without any correctly decoded slices, there can be no frame. Fixes out of array reads Found-by: Rafaël Carré Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 60af6c3138dc501a647bc69b374d5d33d5d86ab5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 February 2013, 15:53:03 UTC |
| 3ef1538 | Michael Niedermayer | 29 January 2013, 03:17:48 UTC | h264: check the pixel format directly and force a reinit on mismatches. The existing checks are insufficient to detect a pixel format changes in case of some damaged streams. Fixes inconsistency and later out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 11c99c78bafa77f679a1a3ba06ad00984b9a4cae) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 February 2013, 15:50:52 UTC |
| 47e462e | Michael Niedermayer | 27 January 2013, 19:37:27 UTC | aacdec: check channel count Prevent out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 96f452ac647dae33c53c242ef3266b65a9beafb6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 February 2013, 15:48:04 UTC |
| f3d1670 | Michael Niedermayer | 25 January 2013, 05:11:59 UTC | vqavideo: check chunk sizes before reading chunks Fixes out of array writes Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ab6c9332bfa1e20127a16392a0b85a4aa4840889) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 February 2013, 15:47:59 UTC |
| 9547034 | Michael Niedermayer | 24 January 2013, 22:11:10 UTC | gifdec: gif_copy_img_rect: Fix end pointer Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c10350358da58600884292c08a8690289b81de29) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 February 2013, 15:47:53 UTC |
| 62c9bed | Michael Niedermayer | 23 January 2013, 23:27:10 UTC | sanm: Check decoded_size. This prevents a buffer overflow in rle_decode() Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7357ca900efcf829de4cce4cec6ddc286526d417) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 February 2013, 15:47:41 UTC |
| 0e68b6d | Diego Biurrun | 01 February 2013, 09:27:45 UTC | Use proper "" quotes for local header #includes (cherry picked from commit 6c1a7d07eb41b4cf36e48ebb560fecd9504fd968) Conflicts: libavcodec/kbdwin.c | 05 February 2013, 15:35:28 UTC |
| 75e88db | Michael Niedermayer | 29 January 2013, 18:10:07 UTC | huffyuvdec: Skip len==0 cases Fixes vlc decoding for hypothetical files that would contain such cases. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0dfc01c2bbf4b71bb56201bc4a393321e15d1b31) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 February 2013, 15:33:37 UTC |
| 6baa549 | Michael Niedermayer | 29 January 2013, 16:56:19 UTC | huffyuvdec: Check init_vlc() return codes. Prevents out of array writes Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f67a0d115254461649470452058fa3c28c0df294) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 February 2013, 15:33:37 UTC |
| 22561bc | Piotr Bandurski | 28 January 2013, 02:42:07 UTC | aasc: fix 16bpp on big-endian Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 February 2013, 15:33:37 UTC |
| 8a44645 | Michael Niedermayer | 05 February 2013, 15:28:36 UTC | Merge remote-tracking branch 'qatar/release/9' into release/1.1 * qatar/release/9: arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht Prepare for 9.2 Release lavr: call mix_function_init() in ff_audio_mix_set_matrix() rtpenc_chain: Use the original AVFormatContext for getting payload type rtp: Make sure the output format pointer is set Conflicts: RELEASE Merged-by: Michael Niedermayer <michaelni@gmx.at> | 05 February 2013, 15:28:36 UTC |
| 85e94a3 | Michael Niedermayer | 05 February 2013, 15:19:17 UTC | Merge commit '62de693a17f9b107be7867d822d5accacd4be544' into release/1.1 * commit '62de693a17f9b107be7867d822d5accacd4be544': rtp: Make sure priv_data is set before reading it videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL get_bits: change the failure condition in init_get_bits mpegvideo: fix loop condition in draw_line() Conflicts: libavcodec/get_bits.h libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 05 February 2013, 15:19:17 UTC |
| 3445bec | Carl Eugen Hoyos | 01 February 2013, 22:27:15 UTC | Do not change codec in flv streams if the user has forced a codec. Fixes ticket #2218. (cherry picked from commit 6a50e8a190bc1329fd3e76e8497bb7f870b6e69b) | 01 February 2013, 22:37:48 UTC |
| c8dace2 | Matthieu Bouron | 01 February 2013, 17:58:14 UTC | ffmpeg: fix broken channel_layout option Fixes ticket #2163. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5a67e30b1c71dc0a84779b543d95ca20faa8cbed) | 01 February 2013, 22:09:50 UTC |
| 9bcb848 | Carl Eugen Hoyos | 01 February 2013, 16:54:48 UTC | doc/muxers.texi: Fix mp3 picture attachment documentation. (cherry picked from commit 99eedfc40086972987aa27df8b1259c8bf15b20c) | 01 February 2013, 16:57:12 UTC |
| 54e1909 | Peter Ross | 06 January 2013, 03:15:24 UTC | wtvdec: demux thumbnail picture to AVStream.attached_pic Fixes ticket #2133. (cherry picked from commit 508836932fcbc3c109fcc4df7a2f2b0bf21bbece) | 30 January 2013, 08:49:59 UTC |
| 3d67f52 | Martin Storsjö | 25 January 2013, 21:16:23 UTC | arm: vp8: Fix the plain-armv6 version of vp8_luma_dc_wht This makes the plain-armv6 version use the same registers as the armv6t2 version above. This fixes fate-vp8 on plain-armv6 devices. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 2026eb1408a718c37835eb4b258c63714ab3205e) Signed-off-by: Martin Storsjö <martin@martin.st> | 28 January 2013, 20:57:07 UTC |
| bfd5865 | Michael Niedermayer | 17 January 2013, 17:52:35 UTC | movenc: check that fps for tmcd is within encodable range. The fps is stored as a 8 bit value thus 255 is the maximum encodable. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 55d66b27902d3f566cd6cf6f08d4233dcdc338f5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 28 January 2013, 01:04:38 UTC |
| 5589549 | Michael Niedermayer | 17 January 2013, 17:51:49 UTC | movenc: Calculate fps for tmcd without intermediate step. Fixes part of Ticket2045 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9362f31b55510142eefa6d0cc26013a30bd4fc51) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 28 January 2013, 01:04:37 UTC |
| 5c316ac | Michael Niedermayer | 17 January 2013, 17:49:46 UTC | ffmpeg: copy tmcd track timebase parameters Fixes part of Ticket2045 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bee044d7c261a9e488ee14705814361694b9acdb) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 28 January 2013, 01:04:36 UTC |
| f4fb841 | Michael Niedermayer | 22 January 2013, 20:30:20 UTC | sanm: check image dimensions before using them Avoids integer overflows and out of array accesses. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 49b729d3af8464de431362e6c5b3027102bc2f88) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 28 January 2013, 00:57:39 UTC |
| c2d1127 | Xi Wang | 23 January 2013, 02:40:05 UTC | rtmp: fix buffer overflows in ff_amf_tag_contents() A negative `size' will bypass FFMIN(). In the subsequent memcpy() call, `size' will be considered as a large positive value, leading to a buffer overflow. Change the type of `size' to unsigned int to avoid buffer overflow, and simplify overflow checks accordingly. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4e692374f7962ea358c329de38c380103f8991b6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 28 January 2013, 00:57:39 UTC |
| b54c155 | Xi Wang | 22 January 2013, 22:49:29 UTC | rtmp: fix multiple broken overflow checks Sanity checks like `data + size >= data_end || data + size < data' are broken, because `data + size < data' assumes pointer overflow, which is undefined behavior in C. Many compilers such as gcc/clang optimize such checks away. Use `size < 0 || size >= data_end - data' instead. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 902cfe2f74d777a7dc20ac68f2393b9f84b790c1) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 28 January 2013, 00:57:39 UTC |
| ea2d445 | Xi Wang | 23 January 2013, 01:58:07 UTC | rtpenc: fix overflow checking in avc_mp4_find_startcode() The check `start + res < start' is broken since pointer overflow is undefined behavior in C. Many compilers such as gcc/clang optimize away this check. Use `res > end - start' instead. Also change `res' to unsigned int to avoid signed left-shift overflow. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2f014567cfd63e58156f60666f1a61ba147276ab) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 28 January 2013, 00:57:39 UTC |
| 59f7d58 | Michael Niedermayer | 20 January 2013, 03:14:09 UTC | mpeg1enc: Disable threads for resolutions too large for multi-threading Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0c6b0409af070a3bfb02b55fde8ba18219edc76b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 28 January 2013, 00:57:39 UTC |
| fb876e4 | Clément Bœsch | 27 January 2013, 11:25:21 UTC | lavf/srtdec: do not try to queue empty subtitle chunks. Regression since 3af3a30. Fixes Ticket2167. (cherry picked from commit f2b6aabd3da7d0d15c7cea0a9fb649b530e2d3cb) | 27 January 2013, 15:32:57 UTC |
| c2d2bf1 | Paul B Mahol | 26 January 2013, 11:58:36 UTC | lavc/iff: ilbm: unbreak decoding on big endian Fixes ticket #2192. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 25c75525bf1da38179ec67924f0be7a2bd8faa0d) | 26 January 2013, 14:10:02 UTC |
| 302094e | Michael Karcher | 25 January 2013, 19:44:50 UTC | Fix atrac3 decoder broken in e55d53905f34f8e8747f6d321e9a695dc02ebb2f Signed-off-by: Michael Karcher <ffmpeg@mkarcher.dialup.fu-berlin.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit dcbb920f1587d1fce777aae947a49304665436b5) | 26 January 2013, 02:36:18 UTC |
| 8d55c24 | Reinhard Tartler | 24 January 2013, 11:02:57 UTC | Prepare for 9.2 Release | 24 January 2013, 11:02:57 UTC |
| d7e7e12 | Justin Ruggles | 16 January 2013, 19:15:57 UTC | lavr: call mix_function_init() in ff_audio_mix_set_matrix() This is needed if a custom matrix is set by the user after opening the AVAudioResampleContext because the matrix channel count can change if different mixing coefficients are used. CC:libav-stable@libav.org (cherry picked from commit f07ef2d9c9e9d1e84c532e9102594834e88a5c83) Conflicts: libavresample/audio_mix.c | 24 January 2013, 11:00:08 UTC |
| a856623 | Martin Storsjö | 23 January 2013, 21:25:09 UTC | rtpenc_chain: Use the original AVFormatContext for getting payload type In ff_rtp_get_payload_type, the AVFormatContext is used for checking whether the payload_type or rtpflags options are set. In rtpenc_chain, the rtpctx struct is a newly initialized struct where no options have been set yet, so no options can be fetched from there. All muxers that internally chain rtp muxers have the "rtpflags" field that allows passing such options on (which is how this worked before 8034130e06), so this works just as intended. This makes it possible to produce H263 in RFC2190 format with chained RTP muxers. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 4a4a7e138c92901e04db46a6b05cc6948023e5f5) Signed-off-by: Martin Storsjö <martin@martin.st> | 24 January 2013, 09:58:09 UTC |
| 348cd84 | Martin Storsjö | 23 January 2013, 21:21:52 UTC | rtp: Make sure the output format pointer is set Not sure if this actually happens, but we do the same check when checking payload_type further above in the function, so it might be needed. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 932117171f32fc3160f3d92943290238945fcb28) Signed-off-by: Martin Storsjö <martin@martin.st> | 24 January 2013, 09:57:29 UTC |
| 62de693 | Martin Storsjö | 23 January 2013, 19:38:41 UTC | rtp: Make sure priv_data is set before reading it This fixes crashes with muxing H263 into RTSP. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit e90820d4f815c15796e642467cdddbad755212a2) Signed-off-by: Martin Storsjö <martin@martin.st> | 24 January 2013, 09:56:43 UTC |
| 33769e9 | Carl Eugen Hoyos | 24 January 2013, 01:30:40 UTC | matroskaenc: add codec_tag lists back. This reverts 312645e : "Do not set codec_tag property for matroska muxers." Also adds dummy codec_tag lists with codecs supported in mkv but not in wav / avi. Fixes ticket #2169. (cherry picked from commit df39c3ce385c02cbd8046298578ea7454c0a0f81) | 24 January 2013, 01:30:40 UTC |
| 1a28948 | Janne Grunau | 20 January 2013, 13:48:35 UTC | videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL libavutil/arm/asm.S sets '.arch' depending on HAVE_ARMV5TE so that assembling armv5te code will always succeed even if the default -march flag does not support it. HAVE_ARMV5TE_EXTERNAL tests assembling code with the default arch. Fixes the missing symbol ff_prefetch_arm with --cpu= not including armv5te. CC: libav-stable@libav.org | 22 January 2013, 12:43:16 UTC |
| 0105044 | Luca Barbato | 20 January 2013, 04:10:32 UTC | get_bits: change the failure condition in init_get_bits Too much code relies in having init_get_bits fed with a valid buffer and set its dimension to 0. Check for NULL buffer instead. (cherry picked from commit 4603ec85ed620e585fc6e2e072c99858ed421855) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 20 January 2013, 13:06:52 UTC |
| edc00de | Michael Niedermayer | 19 January 2013, 23:42:42 UTC | update for 1.1.1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 20 January 2013, 00:11:06 UTC |
| 8d0631c | Xi Wang | 19 January 2013, 18:21:35 UTC | mpegvideo: fix loop condition in draw_line() The loop condition `x = ex' is incorrect. It should be `x <= ex'. This bug was introduced in commit c65dfac4 "mpegvideo.c: K&R formatting and cosmetics." CC:libav-stable@libav.org (cherry picked from commit 992b03183819553a73b4f870a710ef500b4eb6d0) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 19 January 2013, 21:21:23 UTC |
| 1135928 | Michael Niedermayer | 14 January 2013, 15:29:27 UTC | init_get_bits: fix off by 1 error Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7980cca05c7c72fc8b0be4268eea2e156e538228) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 19 January 2013, 16:59:23 UTC |
| 6f3bc92 | Michael Niedermayer | 14 January 2013, 15:23:39 UTC | init_get_bits8: zero pointers & struct on error Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 153fad14e5a2f85637aa6c254ced0fc1c68974e2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 19 January 2013, 16:59:22 UTC |
| bd53103 | Michael Niedermayer | 14 January 2013, 15:22:41 UTC | init_get_bits8: check byte_size against being positive Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ac73d3a12a33c5e4e6357d5f8824e19801663eb5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 19 January 2013, 16:59:21 UTC |
| 90da0cb | Carl Eugen Hoyos | 14 January 2013, 15:28:44 UTC | The c99-to-c89 binaries are now hosted on videolan.org. (cherry picked from commit c29c7c1470f98f8e66752fb09c44ded625e9a991) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 19 January 2013, 16:59:20 UTC |
| 3049d5b | Michael Niedermayer | 12 January 2013, 17:39:54 UTC | doc/RELEASE_NOTES mention changed sample_fmt for audio decoders Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 19 January 2013, 15:31:51 UTC |
| 43c6b45 | Michael Niedermayer | 18 January 2013, 00:28:44 UTC | avcodec_decode_audio: do not trust the channel layout, use the channel count. Fixes memory corruption Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d270c3202539e8364c46410e15f7570800e33343) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 19 January 2013, 15:18:08 UTC |
| 68a0477 | Michael Niedermayer | 11 January 2013, 03:44:20 UTC | error_concealment: Check that the picture is not in a half setup state. Fixes state becoming inconsistent Fixes a null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 23318a57358358e7a4dc551e830e4503f0638cfe) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 19 January 2013, 15:18:01 UTC |
| ccf0cd9 | Paul B Mahol | 07 January 2013, 10:48:02 UTC | 012v: remove double ; and return correct error code if ff_get_buffer() fails Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 25160236957647d81e8beecd6c8fb7f1949fc26e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 19 January 2013, 15:17:24 UTC |
| 002ad7c | Michael Niedermayer | 19 January 2013, 14:21:40 UTC | Merge remote-tracking branch 'qatar/release/9' into release/1.1 * qatar/release/9: fate: update ref after rv30_loop_filter fix rv30: fix masking in rv30_loop_filter() libcdio: support recent cdio-paranoia theora: Skip zero-sized headers h264: add 3 pixels below for subpixel filter wait position h264: fix ff_generate_sliding_window_mmcos() prototype. h264: don't clobber mmco opcode tables for non-first slice headers. Conflicts: configure libavcodec/h264_refs.c tests/ref/fate/filter-delogo tests/ref/fate/rv30 Merged-by: Michael Niedermayer <michaelni@gmx.at> | 19 January 2013, 14:54:36 UTC |
| 397fafa | Jonas Bechtel | 13 January 2013, 20:45:15 UTC | Fix opencv detection. This commit changes the ".so" argument placement in check_ld sub-program. (cherry picked from commit a003c5bd4ff1846edba0518306f8091c14041c96) | 18 January 2013, 09:32:49 UTC |
| 30f0cd2 | Michael Niedermayer | 13 January 2013, 22:44:01 UTC | h264: fix () placement Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c13e4e288c84ba0629ead15e1460c0e498ee2bce) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:31 UTC |
| 4d6d8d9 | Michael Niedermayer | 13 January 2013, 23:07:51 UTC | rtmpproto: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a601eb9543ecab09aa69a6673e553318daf7ea57) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:31 UTC |
| 9348514 | Michael Niedermayer | 13 January 2013, 23:07:26 UTC | lavf/mux: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1ac5a8d7e3343718b0e86b44013742b7ca413c38) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:31 UTC |
| 1770450 | Michael Niedermayer | 13 January 2013, 23:07:02 UTC | vsrc_testsrc: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6f88d2d786b87cbfec5ea16d1cb570ad30c80399) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:31 UTC |
| 2338eda | Michael Niedermayer | 13 January 2013, 23:06:44 UTC | tiff: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 659546b42d6550e67fcdbb4937cd1982c60448aa) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:31 UTC |
| 6a0633e | Michael Niedermayer | 13 January 2013, 23:06:07 UTC | svq1enc: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 37be1d802f2e2c21036a54bb15423a41d5aabefb) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:31 UTC |
| 16dc41d | Michael Niedermayer | 13 January 2013, 23:05:42 UTC | ra144enc: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e2704381e5f13f54506f69b7a05a05dc27ce1d7d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:31 UTC |
| ab471e1 | Michael Niedermayer | 13 January 2013, 23:05:30 UTC | nellymoserenc: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 795d2dc23b16a678d60a681e906aa87c14478597) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:31 UTC |
| 3be8aeb | Michael Niedermayer | 13 January 2013, 23:04:59 UTC | libvorbisenc: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bdd71abe5f34ca37612e17d912060f4dc9b94796) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:31 UTC |
| b48e251 | Michael Niedermayer | 13 January 2013, 23:04:41 UTC | libvo-aacenc: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0ccb31dcad5a1543fbb284d66b0410b91ebd171d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:31 UTC |
| 65a4b90 | Michael Niedermayer | 13 January 2013, 23:04:25 UTC | libspeexenc: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3b8d66d5317d91288751869206b3acbb84dc44c7) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:31 UTC |
| 59956a5 | Michael Niedermayer | 13 January 2013, 23:04:13 UTC | libopencore-amr: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d6180aa29741334cf69f691b27ffceb33f49d36a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:31 UTC |
| d4a08e5 | Michael Niedermayer | 13 January 2013, 23:03:38 UTC | libmp3lame: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 871b6ec01d27a74702b7cf1d61446709de037948) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:31 UTC |
| dacac91 | Michael Niedermayer | 13 January 2013, 23:03:23 UTC | libfdk-aacenc: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9302ad1ac89d5443505cf0418f9d62786513032e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:30 UTC |
| d39400f | Michael Niedermayer | 13 January 2013, 23:03:09 UTC | libfaac: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 68a25c64cda16e12ef3a051ff8661c71ef574683) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:30 UTC |
| 07174ed | Michael Niedermayer | 13 January 2013, 23:02:50 UTC | aacenc: Fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 98fed59427cec17ce55ac137e7e250cff7db81cf) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:30 UTC |
| e747533 | Michael Niedermayer | 13 January 2013, 23:01:40 UTC | doc/examples: fix assignments in if() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 48a7981e6f93a27c9caca99d0bfb39e6244606a5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:30 UTC |
| 722bfe4 | Michael Niedermayer | 13 January 2013, 17:39:06 UTC | swr: fix handling of timestamps that cause multiple drops or silence injections Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d676598f879ba01ddb62f9abe8e17b2e94cb91cd) | 18 January 2013, 04:14:30 UTC |
| cc8ab98 | Michael Niedermayer | 07 January 2013, 14:47:21 UTC | mpeg12enc: check dimension validity Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:30 UTC |
| d7cff9f | Michael Niedermayer | 07 January 2013, 14:31:58 UTC | mpeg12enc: Correctly mask dimensions Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:30 UTC |
| 9bfda9d | Michael Niedermayer | 07 January 2013, 14:31:00 UTC | mpeg12: Support decoding dimensions that are a multiple of 4096 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 January 2013, 04:14:30 UTC |
| 0a837b6 | Luca Barbato | 17 January 2013, 22:06:46 UTC | fate: update ref after rv30_loop_filter fix (cherry picked from commit 56ef1ef1f7580f41d6819ac63081a02f52752903) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 17 January 2013, 22:47:01 UTC |
| c3c1db7 | Xi Wang | 17 January 2013, 06:24:15 UTC | rv30: fix masking in rv30_loop_filter() The mask `x && (1 << y)' is incorrect and always yields true. The correct form should be `x & (1 << y)'. CC: libav-stable@libav.org Signed-off-by: Xi Wang <xi.wang@gmail.com> (cherry picked from commit 783e37f7ef3b3cdcfe7aa927a25b4184ae46cd53) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 17 January 2013, 21:00:01 UTC |
| 21ca4ab | Luca Barbato | 17 January 2013, 10:24:01 UTC | libcdio: support recent cdio-paranoia Upstream decided to split the paranoia interface and move the headers accordingly. (cherry picked from commit 57224e425c567a87798b66425acc383c6dd37331) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 17 January 2013, 20:42:03 UTC |
| c749bec | Martin Storsjö | 17 January 2013, 14:03:36 UTC | theora: Skip zero-sized headers This fixes a regression since d9cf5f51/7a2ee770f5 with theora over RTP (possibly with other variants of theora as well). In theora over RTP, the second of the 3 headers turns out to be 0 bytes long, which prior to d9cf5f51 worked just fine. After d9cf5f51, reading from the bitstream reader fails (since the reader wasn't initialized but returned an error if initialized with 0 bits). CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit e33db35b4a91ad543d9dde3a981a89118ba68937) Signed-off-by: Martin Storsjö <martin@martin.st> | 17 January 2013, 17:11:54 UTC |
| a95306e | Carl Eugen Hoyos | 17 January 2013, 16:19:08 UTC | Only skip MLP header in mpeg files if the codec actually is MLP. Fixes PCM audio in Kansas Pheasant Hunt 2000 mpg file. Reported-by: Mashiat Sarker Shakkhar (cherry picked from commit ad406f7e402977cb7dbc78ccb63e21c137f6699e) | 17 January 2013, 16:40:02 UTC |
| ed12d1e | Carl Eugen Hoyos | 10 January 2013, 09:04:46 UTC | Fix compilation with --disable-everything. (cherry picked from commit f023003ce610a8fd6377cf4a8e98002ac3117ef4) | 17 January 2013, 16:39:00 UTC |
| 05ed9b7 | Michael Niedermayer | 07 January 2013, 13:14:41 UTC | oggparsevorbis: fix vorbis_cleanup return type Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 17 January 2013, 03:34:47 UTC |
| 76477c3 | Michael Niedermayer | 17 January 2013, 02:37:48 UTC | Merge remote-tracking branch 'qatar/release/9' into release/1.1 * qatar/release/9: libx264: use the library specific default rc_initial_buffer_occupancy lavc: set the default rc_initial_buffer_occupancy lavc: introduce the convenience function init_get_bits8 lavc: check for overflow in init_get_bits APIchanges: Fill in missing hashes and dates; fix a version number typo. configure: enable pic for shared libs on AArch64 zmbv: Reset the decoder on keyframe errors vc1dec: prevent a crash due missing pred_flag parameter matroska: Fix use after free vp3: Fix double free in vp3_decode_end() update Changelog oggdec: make sure the private parse data is cleaned up oggdec: free the ogg streams on read_header failure update Changelog x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions Prepare 9.1 Release Conflicts: Changelog RELEASE doc/APIchanges libavcodec/utils.c libavformat/oggdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 17 January 2013, 03:26:42 UTC |
| ccc4219 | Carl Eugen Hoyos | 17 January 2013, 01:11:12 UTC | Fix detection of struct v4l2_frmsize_discrete. It was always detected successfully. (cherry picked from commit c345100efc9baae0ea7c9fcc376725cae5d3df6e) | 17 January 2013, 01:13:40 UTC |
| 9d60f60 | Ronald S. Bultje | 15 January 2013, 16:38:54 UTC | h264: add 3 pixels below for subpixel filter wait position If the motion vector is at a subpixel position, we need 3 pixels below the motion vector's wholepel position available, not 2, since the MC filter is a sixtap filter for the hpel position, and then a bilin filter for the qpel position. This patch fixes highly irreproducible (0.1%) fate failures in frame 2 and 4 of h264-conformance-cama2_vtc_b (e.g. first P-frame, first field, last line of MB x=40,y=2 and second field and last lines of MBs x=39-40, y=3). These used pre-loopfilter instead of post-loopfilter data because the await_progress() waited for one line too little in that field, and the motion vector of these particular MBs happened to align exactly to a position where that demonstrates the bug. CC: libav-stable@libav.org (cherry picked from commit fb845ffdd335a1efd6dfd43e8adeb530397b348e) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 15 January 2013, 21:20:10 UTC |
| 6a4803a | Anton Khirnov | 14 January 2013, 19:07:53 UTC | h264: fix ff_generate_sliding_window_mmcos() prototype. It's been returning an error value since bad446e251405dc250c3cbee199072e083a1e4b9 Also check for the errors it returns. (cherry picked from commit ea382767ad2191acbe97e90624059723e15f0e4b) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 15 January 2013, 21:19:42 UTC |
| c3b6772 | Ronald S. Bultje | 14 January 2013, 05:46:44 UTC | h264: don't clobber mmco opcode tables for non-first slice headers. Clobbering these tables will temporarily clobber the template used as a basis for other threads to start decoding from. If the other decoding thread updates from the template right at that moment, subsequent threads will get invalid (or, usually, none at all) mmco tables. This leads to invalid reference lists and subsequent decode failures. Therefore, instead, decode the mmco tables only for the first slice in a field or frame. For other slices, decode the bits and ensure they are identical to the mmco tables in the first slice, but don't ever clobber the context state. This prevents other threads from using a clobbered/invalid template as starting point for decoding, and thus fixes decoding in these cases. This fixes occasional (~1%) failures of h264-conformance-mr1_bt_a with frame-multithreading enabled. (cherry picked from commit bad446e251405dc250c3cbee199072e083a1e4b9) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 15 January 2013, 21:19:07 UTC |
| 1c37345 | Michael Niedermayer | 13 January 2013, 20:32:34 UTC | oggdec: Leave treatment of serial changes to the decoder. Attempting to re-parse the headers at demuxer level is a pandora box the way its done currently. This allows full reconfiguration of vorbis streams Fixes Ticket2117 Fixes Ticket2121 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c994bb2fb7727f5c20ef71cc6727fb219fd49d60) | 15 January 2013, 20:12:03 UTC |
| 9636266 | Michael Niedermayer | 13 January 2013, 20:31:17 UTC | vorbisdec: handle midstream parameter changes Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e9ffee23f372390684d6d94bf8abf51350fc66a3) | 15 January 2013, 20:12:03 UTC |
| dc33490 | Michael Niedermayer | 13 January 2013, 19:44:39 UTC | vorbisdec: support freeing partially allocated contexts. Fixes null pointer derefernces Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 778069c8325514518712d194749577b3451b4125) | 15 January 2013, 20:12:03 UTC |
| 66a3112 | Michael Niedermayer | 13 January 2013, 20:23:11 UTC | oggdec: resync from the last page. Previously we re synced from where we where which cam lead to loosing pages. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c5cf58d4b9b04cee1487a3095b83300791c21f15) | 15 January 2013, 20:12:03 UTC |
| 72eca26 | Luca Barbato | 14 January 2013, 04:32:39 UTC | libx264: use the library specific default rc_initial_buffer_occupancy By default libav sets it to 3/4 while x264 sets it to 9/10. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 47812070a267cbdf74164e154d03d99bf8ced100) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 15 January 2013, 08:12:46 UTC |
| e44d56b | Luca Barbato | 14 January 2013, 04:32:38 UTC | lavc: set the default rc_initial_buffer_occupancy rc_buffer_size is not set before. Solve the initial the rate control underflow issue reported in bug 222. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit bff3607547fdbb6e32b3830a351e6a33280c1e0d) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 15 January 2013, 08:12:41 UTC |
| 71e00ca | Luca Barbato | 13 January 2013, 22:37:11 UTC | lavc: introduce the convenience function init_get_bits8 Accept the buffer size in bytes and check for overflow before passing the value in bits to init_get_bits. (cherry picked from commit e28ac6e5e27e64a206e399e958481c1e6f992189) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 14 January 2013, 04:22:22 UTC |
| 7a2ee77 | Luca Barbato | 13 January 2013, 18:52:45 UTC | lavc: check for overflow in init_get_bits Fix an undefined behaviour and make the function return a proper error in case of overflow. CC: libav-stable@libav.org (cherry picked from commit d9cf5f516974c64e01846ca685301014b38cf224) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 14 January 2013, 04:21:57 UTC |
| fadebd2 | Diego Biurrun | 12 January 2013, 11:53:45 UTC | APIchanges: Fill in missing hashes and dates; fix a version number typo. | 12 January 2013, 11:59:25 UTC |
| 3dab6e5 | André Pankratz | 10 January 2013, 09:37:49 UTC | lavfi/yadif: fix shorthand/option mismatch Fix trac ticket #2128. Signed-off-by: Stefano Sabatini <stefasab@gmail.com> (cherry picked from commit 0287eea914307a3fa03fa0d117af2955de0a4a2f) | 12 January 2013, 01:34:06 UTC |
| bc182a6 | Marcin Juszkiewicz | 10 January 2013, 12:22:53 UTC | configure: enable pic for shared libs on AArch64 Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit d11cb13b0ef02fb1c303b29805819f6e1c9dc61b) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> | 11 January 2013, 12:02:44 UTC |
