| 0a64e9a | Michael Niedermayer | 28 July 2014, 00:40:35 UTC | version.sh: Print versions based on the last git tag for release branches release branches are detected by checking if "git" is not in RELEASE This changes "N-64706-g2f71aeb" to "n2.3-8-g2f71aeb" for git master theres no change This should improve the readability of lists of versions which come from more than 1 release branch or master + release. fate.ffmpeg.org is one possible example Reviewed-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ee606fd0317df202b59946cf9b738c0a01056316) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1f4d779e87050111f831f24645580f04e0b1917b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 19 August 2014, 01:16:20 UTC |
| 59b2a9e | Michael Niedermayer | 28 July 2014, 00:22:11 UTC | remove VERSION file it overrides what version.sh prints and thus makes its output from release branches rather useless Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2f71aeb30161edb5cb0fea5d3080094a22cc3038) Conflicts: VERSION (cherry picked from commit f543d32455a30c7e11206241184dfb16b8a8081c) Conflicts: VERSION | 19 August 2014, 01:16:11 UTC |
| 4ce6d65 | Michael Niedermayer | 19 August 2014, 00:13:02 UTC | Changelog: update for 1.2.8 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 19 August 2014, 00:13:02 UTC |
| ab4e54f | Michael Niedermayer | 17 August 2014, 15:31:13 UTC | update for 1.2.8 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 17 August 2014, 15:31:13 UTC |
| 1834284 | Christophe Gisquet | 11 August 2014, 22:06:08 UTC | proresenc_kostya: report buffer overflow If the allocated size, despite best efforts, is too small, exit with the appropriate error. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 52b81ff4635c077b2bc8b8d3637d933b6629d803) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 17 August 2014, 14:49:56 UTC |
| 61a5159 | Luca Barbato | 28 June 2013, 01:40:35 UTC | lavc: move put_bits_left in put_bits.h (cherry picked from commit afe03092dd693d025d43e1620283d8d285c92772) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 17 August 2014, 14:49:56 UTC |
| abc1fa7 | Michael Niedermayer | 10 August 2014, 19:59:33 UTC | avcodec/iff: check pixfmt for rgb8 / rgbn Fixes out of array access Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3539d6c63a16e1b2874bb037a86f317449c58770) Conflicts: libavcodec/iff.c (cherry picked from commit 656f930160db48e0b7b25069c62abc340e7f0628) Conflicts: libavcodec/iff.c | 10 August 2014, 20:31:02 UTC |
| f712d36 | Anton Khirnov | 06 August 2014, 10:56:34 UTC | cdgraphics: do not return 0 from the decode function 0 means no data consumed, so it can trigger an infinite loop in the caller. CC:libav-stable@libav.org (cherry picked from commit c7d9b473e28238d4a4ef1b7e8b42c1cca256da36) Conflicts: libavcodec/cdgraphics.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | 07 August 2014, 00:05:19 UTC |
| ca232ff | Michael Niedermayer | 02 August 2014, 20:30:03 UTC | avformat/tee: flip assigment direction Found-by: CSA Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2e6fdcb7f3c86491408a3699f0aa9dc52b7c5686) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 August 2014, 01:18:15 UTC |
| b4632ce | Michael Niedermayer | 01 August 2014, 23:16:14 UTC | avcodec/dvdsub_parser: print message if packet is smaller than the packet size field Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bcc898dd2643c883522ffa565be4b226ce798c78) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 01 August 2014, 23:27:37 UTC |
| 454f6c6 | Michael Niedermayer | 01 August 2014, 23:15:37 UTC | avcodec/dvdsub_parser: Check buf_size before reading 32bit packet size Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 81c1657a593b1c0f8e46fca00ead1d30ee1cd418) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 01 August 2014, 23:27:36 UTC |
| f70ee7d | Michael Niedermayer | 01 August 2014, 22:27:23 UTC | avcodec/dvdsub_parser: never return 0 when the input isnt 0 Fixes a infinite loop Fixes Ticket3804 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cfdb30d2f1241de9354a8efdbf8252d0f1a6f933) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 01 August 2014, 23:27:34 UTC |
| c285db7 | Michael Niedermayer | 12 July 2014, 23:07:59 UTC | avformat/utils: do not wait for packets from discarded streams for genpts Fixes long loop Fixes Ticket3208 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8202c49b43621c04e26d4a3aa83a10e1e5cc1836) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 12 July 2014, 23:15:57 UTC |
| cc8d20e | Michael Niedermayer | 23 June 2014, 16:32:54 UTC | Update for FFmpeg 1.2.7 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:32:54 UTC |
| c2b72ea | Michael Niedermayer | 14 June 2014, 22:49:02 UTC | avformat/mpc: attempt to allocate a packet that is not smaller than the data inside it Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 86a9370e2b91d67375e66a06d6eb573b5a017775) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:43 UTC |
| 9d77a62 | Michael Niedermayer | 08 June 2014, 12:30:30 UTC | avcodec/alsdec: Clear MPEG4AudioConfig so that no use of uninitialized memory is possible Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6e6bd5481cf42a9765c492c77754d4633092cece) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:43 UTC |
| f2aaee4 | Michael Niedermayer | 07 June 2014, 10:03:31 UTC | avformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial format extensions being enabled. Found-by: Jean-Baptiste Kempf <jb@videolan.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 74760883fcb4443d105814ed246b3cf51d7e9dca) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:43 UTC |
| d13cf32 | Michael Niedermayer | 25 May 2014, 03:19:09 UTC | avcodec/mss4: Fix () in MKVAL() macro Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cf7ff0146c76b93c32edf5230a28b9590acf5105) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| 5626e11 | Michael Niedermayer | 25 May 2014, 03:18:47 UTC | avcodec/mss34dsp: fix () in SOP* macros Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6e720c5c815e510188a0bda654662383f2c48050) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| 8d1f38c | Michael Niedermayer | 25 May 2014, 03:17:51 UTC | avcodec/mlpdec: fix () in MSB_MASK() macro Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fa160af08b6f42f17e93124aef86e3f6eec70d51) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| ea7fbd0 | Michael Niedermayer | 25 May 2014, 01:27:56 UTC | avcodec/golomb-test: fix () in EXTEND() macro Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 97e6b5ee3a16fee7d130f19f4dcee030f14d91cf) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| b2b4df8 | Michael Niedermayer | 25 May 2014, 01:19:47 UTC | avcodec/aac: fix () in IS_CODEBOOK_UNSIGNED macro Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fa915d4193e13187773c500b80c7df6baeb22c3b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| 5691d9a | Michael Niedermayer | 21 May 2014, 01:02:06 UTC | avcodec/libvorbisenc: dont add the duration to AV_NOPTS_VALUE Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 19e66c7232d96e4ae8f05b52da2b84dfaa4e4da3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| 2b8490b | Michael Niedermayer | 20 May 2014, 03:23:52 UTC | avutil/cpu: force mmx on selection of higher x86 SIMD features Fixes various runtime failures with manually set flags that represent no existing CPU Fixes Ticket3653 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6310eb8010b7a3b3016e297132380cbd4e3d2d10) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| 4b638ea | Michael Niedermayer | 19 May 2014, 04:19:23 UTC | avcodec/diracdec: move mc buffer allocation to per frame Fixes out of array accesses for non default buffers with large strides Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4a30f08505a4e85718896ff233c97be41a9754ca) (cherry picked from commit 9c9fc79d9237d28e33161cb2e75082d8ad232b2e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| 4ecd718 | Michael Niedermayer | 28 April 2014, 02:01:50 UTC | avfilter/graphdump: Fix pointer to local outside scope Fixes CID1194435 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 18af0ce62da322176f7bd283b85314d2f41bee2c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| 0607c8a | Michael Niedermayer | 27 April 2014, 03:32:56 UTC | avcodec/mjpegdec: Fix undefined shift Fixes CID1194388 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b4329605289e25bb071ec1c1182bf25fc83b09aa) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| 3c385ea | Michael Niedermayer | 27 April 2014, 01:45:12 UTC | ffmpeg_filter: fix pointer to local outside scope Fixes CID1206652 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 09b16619d33ddf93005060d0782f28a1c1cbb7f6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| c7e9626 | Michael Niedermayer | 23 April 2014, 23:25:46 UTC | swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input Fixes Ticket 3542 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 291d464161a5bf3b566bc147f83e4242b0c18d74) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| 26d7253 | Michael Niedermayer | 23 April 2014, 19:47:48 UTC | avformat/h263dec: Fix h263 probe The code was missing 1 bit in the src format Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fc145e576a443bfc89efdf35b91fd3c9ca0d8388) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| c75a915 | Michael Niedermayer | 23 April 2014, 04:04:50 UTC | avformat/mux: Check for and remove invalid packet durations Fixes assertion failure Fixes Ticket3575 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit dc6a17cf74a90e41d70ea1753cdb70c0a5b2ced8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| ecd3028 | Michael Niedermayer | 23 June 2014, 12:45:47 UTC | avutil/lzo: add asserts to be double sure against overflows These asserts cannot fail since d6af26c55c1ea30f85a7d9edbc373f53be1743ee Based-on: ccda51b14c0fcae2fad73a24872dce75a7964996 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cf2b7c01f81c1fb3283a1390c0ca9a2f81f4f4a8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| eada99a | Michael Niedermayer | 20 June 2014, 01:15:28 UTC | avutil/lzo: Fix integer overflow Embargoed-till: 2014-06-27 requested by researcher, but embargo broken by libav today (git and mailing list) Fixes: LMS-2014-06-16-4 Found-by: "Don A. Bailey" <donb@securitymouse.com> See: ccda51b14c0fcae2fad73a24872dce75a7964996 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d6af26c55c1ea30f85a7d9edbc373f53be1743ee) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| 9ade5b8 | Xi Wang | 15 March 2013, 10:59:22 UTC | lzo: fix overflow checking in copy_backptr() The check `src > dst' in the form `&c->out[-back] > c->out' invokes pointer overflow, which is undefined behavior in C. Remove the check. Also replace `&c->out[-back] < c->out_start' with a safe form `c->out - c->out_start < back' to avoid overflow. CC: libav-stable@libav.org Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:17:42 UTC |
| 753f073 | Michael Niedermayer | 21 April 2014, 09:33:17 UTC | avfilter/filtfmts: Support dynamically allocated in/outputs Fixes crash Fixes Ticket3468 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 59c7615d58b5b7ea9caff2c8c774677973eb4f1c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:21 UTC |
| 85b00d7 | Michael Niedermayer | 16 April 2014, 00:06:37 UTC | iavcodec/vc1dec: Fix missing {} Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cb53beb81a5b9192c79de401f1e1e13fadddc429) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:21 UTC |
| 8d60d8b | Michael Niedermayer | 16 April 2014, 00:06:37 UTC | avfilter/vf_deshake: fix loss of precission with odd resolutions Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 73734282e0e4df92269984ee1671424e39249481) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:21 UTC |
| 53c02d0 | Michael Niedermayer | 16 April 2014, 00:55:13 UTC | avcodec/g723_1: add assert to help static code analyzers Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1457f3fd90e17745791354fbb87899fc4803085a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:21 UTC |
| 90c7dfb | Michael Niedermayer | 16 April 2014, 00:06:37 UTC | avcodec/diracdec: fix undefined behavior with shifts Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b8598f6ce61ccda3f2ff0c730b009fb650e42986) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:21 UTC |
| 424b00a | Michael Niedermayer | 16 April 2014, 00:06:37 UTC | avformat/mpegts: Remove redundant check Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ff6fa0b4b980fc5b9f7653d7b159ae02c3d95210) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:21 UTC |
| 7b38ea4 | Michael Niedermayer | 16 April 2014, 00:06:37 UTC | avcodec/mjpegen: Fix declared argument size Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 256f530603ef3838a712a4fcd737b46b7bce455e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| 71104f7 | Michael Niedermayer | 15 April 2014, 23:55:08 UTC | swscale/swscale: fix srcStride/srcSlice typo Fixes part of Ticket3466 Found by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 14fa7fc6a81d5e59e05243cdc92108eab1b138ac) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| 98fe429 | Michael Niedermayer | 14 April 2014, 15:29:27 UTC | avcodec/x86/idct_sse2_xvid: fix non C99 inline function Found-by: Matt Oliver <protogonoi@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 46d5625f44185271862337d61cd246fd569c42a4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| 90cf672 | Anthoine Bourgeois | 09 April 2014, 10:18:32 UTC | avcodec/dirac_arith: Fix build with PIC and stack-check options Fixes Ticket3540 The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be built with PIC and check-stack because the asm code needs 6 registers and PIC and check-stack options take 1 each and x86 is quite limited in this area. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d8ab7f31dd819f7b3e0d460a2fa4261aaae87b98) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| 4af5648 | Michael Niedermayer | 08 April 2014, 16:12:12 UTC | swscale/x86/swscale_template: loose hardcoded dstw_offset Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f6759d9ad4a8b71e6f212ca4f1e7da9fa56d3298) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| 4065e55 | Michael Niedermayer | 07 April 2014, 22:29:26 UTC | swresample/resample: use av_malloc_array() where appropriate Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5027f39712fdce25b9008e72d52e5abfeefd5fe6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| fe97363 | Michael Niedermayer | 07 April 2014, 22:29:06 UTC | swresample/dither: use av_malloc_array() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a5290cb1ac047851563da7aca06569e3ada55f79) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| ce95904 | Michael Niedermayer | 07 April 2014, 22:19:07 UTC | swresample/resample: Limit filter length Related to CID1197063 The limit choosen is arbitrary and much larger than what makes sense. It avoids the need for checking arithmetic operations with the length for overflow Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f9158b01d0f3effb58e87fb07db0382bc1e47de5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| a61998e | Michael Niedermayer | 06 April 2014, 02:01:24 UTC | avcodec/msrle: check return code for success before use The check is possibly redundant, but better to check for errors that dont occur than to skip the check and crash Fixes CID1197060 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 754f84663e8b3a88fa2e953b195d59230393fb8d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| e5546d4 | Michael Niedermayer | 05 April 2014, 19:34:03 UTC | avcodec/wma: use av_freep(), do not leave stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d167faafe9dfa0b82bebb267c3c4e5fa5286bd67) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| 8f7ebb8 | Lukasz Marek | 04 April 2014, 17:28:45 UTC | lavu/opt: validate range before dereference This change make error handling simplier. av_opt_freep_ranges may be called when some ranges are NULL, for example after memory allocation fail. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3aac5fcfa9d3748659d78ab2a66d0ccce22cfd4f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| e897eb1 | Michael Niedermayer | 27 March 2014, 23:03:38 UTC | avcodec/libx264: move where x264opts is applied down so it isnt overridden by avctx & defaults fixes x264opts opengop=1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 64b79141bdfdffaa9fda69eecce140473d0a9a18) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| 2af3a04 | Michael Niedermayer | 26 March 2014, 17:09:23 UTC | avcodec/h264_mp4toannexb_bsf: prepend global headers before any in stream parameter sets Fixes h264_mp4toannexb_bsf_failure.mkv Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 289b149cecb381522cc9ccdf382825330169c655) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| 92ca357 | Michael Niedermayer | 24 March 2014, 23:15:52 UTC | avcodec/x86/mpegvideoenc_template: fix integer overflow Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| 1be06c8 | Michael Niedermayer | 24 March 2014, 04:01:32 UTC | swscale/swscale: fix integer overflow Should fix fate failure with clang ftrapv Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c9c0451224fd7bc38b4e135e99f114f80c1ae67f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 23 June 2014, 16:16:20 UTC |
| 6011b80 | Carl Eugen Hoyos | 21 June 2014, 17:35:06 UTC | Show duration for large asf files as written in the file header. Fixes ticket #3428. (cherry picked from commit e3fd263f0b73e4425192d6dd1ab18027ecaa35db) | 21 June 2014, 21:08:55 UTC |
| 3ac85d7 | Carl Eugen Hoyos | 19 June 2014, 23:58:14 UTC | Revert two backports to release/1.2 that broke fate. Revert "ff_id3v2_read: add option to limit ID3 magic number search" Revert "ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL" This reverts commit 7f8aa37bc3666d060b3eb2baa02fcea3597a22fd. This reverts commit 5219e20d58e15305e188ba60a75bfc37a1f82341. | 19 June 2014, 23:58:14 UTC |
| 401b3da | Martin Storsjö | 06 June 2014, 09:03:09 UTC | adpcm: Write the proper predictor in trellis mode in IMA QT The actual predictor value, set by the trellis code, never was written back into the variable that was written into the block header. This was accidentally removed in b304244b. This significantly improves the audio quality of the trellis case, which was plain broken since b304244b. Encoding IMA QT with trellis still actually gives a slightly worse quality than without trellis, since the trellis encoder doesn't use the exact same way of rounding as in adpcm_ima_qt_compress_sample and adpcm_ima_qt_expand_nibble. Fixes part of Ticket3701 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fa8f060b75bf9074792a0f9ff4ed002652ef62b8) Conflicts: tests/ref/acodec/adpcm-ima_qt-trellis | 09 June 2014, 22:24:30 UTC |
| 71516ac | Martin Storsjö | 05 June 2014, 08:56:10 UTC | adpcm: Fix trellis encoding of IMA QT This was broken in 095be4fb - samples+ch (for the previous non-planar case) equals &samples_p[ch][0]. The confusion probably stemmed from the IMA WAV case where it originally was &samples[avctx->channels + ch], which was correctly changed into &samples_p[ch][1]. Fixes part of Ticket3701 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a32765c4252eb106a2ade543026ef6f59e699bfa) | 09 June 2014, 22:24:22 UTC |
| 0983720 | Carl Eugen Hoyos | 29 May 2014, 06:41:15 UTC | avcodec/utvideodec: Increase vlc len Fixes a regression since fb3e380 similar to ticket #2661, reported by fluffrabbit at aol dot com. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 673716c54b39eba9579a38ad222130e3f9549167) Conflicts: libavcodec/utvideodec.c | 09 June 2014, 22:21:05 UTC |
| 9e9d92b | Michael Niedermayer | 04 June 2014, 03:04:13 UTC | avformat/avidec: allow rounding errors between scale/rate and timebase Fixes Ticket3670 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 571ab8344a9a2864d22d01af41283cee9328b927) Conflicts: libavformat/avidec.c | 09 June 2014, 22:18:22 UTC |
| 3d79041 | Michael Niedermayer | 30 April 2014, 04:21:58 UTC | sws: dont use the optimized 410->420 unscaled conversion when height%4 Fixes Ticket3594 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 421b21ca8a02a346ba03cea3bb2ecc33f791fc30) | 01 May 2014, 16:32:45 UTC |
| 2c71734 | Michael Niedermayer | 30 April 2014, 02:12:29 UTC | avcodec/vorbisdec: try to workaround libvorbisenc bug Fixes Ticket3590 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0a266cb55af9794fc5cff695d35cae4111e4334f) Conflicts: libavcodec/vorbisdec.c | 01 May 2014, 16:32:13 UTC |
| 0759bdc | Stefano Sabatini | 22 April 2014, 11:01:14 UTC | ffprobe: fix scaling of vali in value_string() in case -prefix is selected Fix trac ticket #3523. (cherry picked from commit 1ba59b1cbeafe7cd28db04f772abd89eb7e4ce1e) | 23 April 2014, 15:22:49 UTC |
| 1530fbc | Michael Niedermayer | 22 April 2014, 02:00:32 UTC | avformat/avidec: Speed up keyframe detection code Fixes Ticket3531 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 57fb570908df2e84b11635f12b5be1fb27f053eb) Conflicts: libavformat/avidec.c | 23 April 2014, 15:22:06 UTC |
| 7f8aa37 | Peter Ross | 18 April 2014, 04:49:40 UTC | ff_id3v2_read: add option to limit ID3 magic number search Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 ' chunk tag. If such chunks are stored sequentially, it is possible for the ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g. [1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...] [2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...] Fixes ticket #3530. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5331773cc33ba26b9e26ace643d926219e46a17b) Conflicts: libavformat/dsfdec.c libavformat/id3v2.c | 19 April 2014, 11:28:22 UTC |
| 5219e20 | Peter Ross | 19 April 2014, 02:12:00 UTC | ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL Fixes ticket #3530. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c94305ae23318c8956a30485cd5642829f4f16a9) | 19 April 2014, 11:20:04 UTC |
| 8ee704c | Michael Niedermayer | 19 January 2014, 17:35:33 UTC | avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0 Fixes part of Ticket3256 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5800b08572ef5f776950fc6f1b6572ba9a6b1933) Conflicts: libavformat/matroskadec.c | 16 April 2014, 17:51:51 UTC |
| 9060c10 | Michael Niedermayer | 19 January 2014, 19:59:28 UTC | avformat/matroskaenc: wrap V_QUICKTIME codec private in something that looks like its part of quicktime stsd This is needed for matroska spec compliance Fixes playback of SVQ3 in matroska with vlc Fixes Ticket 3256 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8456bd2c0f3b08756f353646fe3b40a6772e665e) | 16 April 2014, 17:46:38 UTC |
| 5202621 | Michael Niedermayer | 12 February 2014, 05:32:51 UTC | avformat/mov: fix keyframe flags for sample from chromium Issue 340865 Fixes ticket #3362. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a0911b059763b8f13c70adcbbe71e10382855104) | 24 March 2014, 22:30:34 UTC |
| da6a8c9 | Hendrik Leppkes | 04 November 2013, 15:22:27 UTC | avformat/mov: only force parsing for video tracks if stss is empty Fixes playback of some AAC streams, which are otherwise mangled by the parser, and stss is typically only valid for video anyway. Fixes a regression since e41ea866. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 019247bdc326a90bf20d3ce5d2413cc642e8bb08) | 24 March 2014, 22:30:09 UTC |
| f07cebc | Michael Niedermayer | 18 March 2014, 17:06:17 UTC | avcodec/h263dec: Fix use of uninitialized memory from the bitstream buffer Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 March 2014, 17:06:17 UTC |
| d0ba12f | Michael Niedermayer | 15 March 2014, 21:52:22 UTC | swscale/x86/swscale: fix missing xmm clobbers in yuv2yuvX_sse3() Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6c47a4e972485e5f0c812159373f703c6f1d089f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 March 2014, 16:07:58 UTC |
| a58053d | Michael Niedermayer | 13 March 2014, 16:32:15 UTC | avutil/timestamp: Warn about missing __STDC_FORMAT_MACROS for C++ use Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8b02dfd37cb3bc9521fc6e1f5b5f13c80d144cd2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 18 March 2014, 16:07:58 UTC |
| b1a960c | Peter Ross | 14 March 2014, 09:02:04 UTC | avcodec/adpcm: squelch 'mismatch in coded sample count' warning for AV_CODEC_ID_ADPCM_EA_R2/3 These ADPCM codecs include a per-frame flag that enables a raw 16-bit mode. Therefore the the number of samples returned by get_nb_samples() is only ever approximate. Fixes ticket #3460. Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7380201451a2edfb240cd356579c4c39a87cf5bd) | 17 March 2014, 15:06:20 UTC |
| 620d80d | Peter Ross | 15 March 2014, 00:16:19 UTC | avcodec/adpcm: ADPCM_IMA_DK3 packets are padded to 16-bit packet boundary Fixes ticket #3461. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d1bb17940dd242e56541775318636bcbe3eab73d) | 17 March 2014, 15:06:09 UTC |
| e3ce3d3 | Michael Niedermayer | 17 March 2014, 01:25:20 UTC | avcodec/h264: be more tolerant on what pixel format changes trigger reinits Fixes Ticket3260 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8e92ff25469f75f5c1fcbb9ba5721cea341ca34a) Conflicts: libavcodec/h264.c | 17 March 2014, 15:06:04 UTC |
| f31682f | Michael Niedermayer | 12 March 2014, 00:50:41 UTC | avformat/flvdec: discard inconsistent timestamps Fixes Ticket3425 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit dbc3e1109cddd7ab653dce0f7758bad17b94803d) Conflicts: libavformat/flvdec.c | 13 March 2014, 06:37:58 UTC |
| fb44a3e | Michael Niedermayer | 11 March 2014, 19:45:29 UTC | avcodec/vorbisdec: use the stored previous window type only when the actual previous is not known Fixes Ticket3432 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5171ae781a240cac3860c20f9aefc6d1b2c61cac) | 13 March 2014, 06:35:17 UTC |
| 6ee47bd | Michael Niedermayer | 10 March 2014, 12:15:37 UTC | Merge remote-tracking branch 'TimothyGu/release/1.2' into release/1.2 * TimothyGu/release/1.2: configure: use pkg-config to detect libbluray Merged-by: Michael Niedermayer <michaelni@gmx.at> | 10 March 2014, 12:15:42 UTC |
| 7819750 | Luca Barbato | 27 July 2013, 13:48:41 UTC | avidec: Let the inner dv demuxer take care of discarding Fixes ticket #1796. (cherry picked from commit c8f0b20b4a6bb6691928789d83e4b02896969848) Conflicts: libavformat/avidec.c | 09 March 2014, 13:05:17 UTC |
| 0d819ed | Timothy Gu | 24 February 2014, 00:39:18 UTC | configure: use pkg-config to detect libbluray The current configure fails when static libbluray is compiled with libxml2 support. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit baa650cc7946a9eb1cf5a083f61a581a97122f03) Signed-off-by: Timothy Gu <timothygu99@gmail.com> Conflicts: configure | 07 March 2014, 01:55:46 UTC |
| e63346f | Michael Niedermayer | 05 March 2014, 02:55:25 UTC | update for 1.2.6 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 March 2014, 02:55:25 UTC |
| ddcccab | Michael Niedermayer | 01 March 2014, 01:40:19 UTC | avcodec/utvideoenc: fix slice_bits size Fixes assertion failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0a8c90202bb906747168a698b6837496f82c717c) Conflicts: libavcodec/utvideoenc.c (cherry picked from commit 57522ca79cc38c279123596d3288ddbf56fa8903) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 March 2014, 02:06:10 UTC |
| b580bae | Michael Niedermayer | 18 February 2014, 01:53:14 UTC | avcodec/snow: split block clipping checks Fixes out of array read Fixes: d4476f68ca1c1c57afbc45806f581963-asan_heap-oob_2266b27_8607_cov_4044577381_snow_chroma_bug.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 61d59703c91869f4e5cdacd8d6be52f8b89d4ba4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 March 2014, 02:06:10 UTC |
| 9085cdd | Michael Niedermayer | 17 February 2014, 19:49:42 UTC | avcodec/ansi: fix integer overflow Fixes out of array read Fixes: 5f9698e86d92f19bb08d54ff0d57027f-signal_sigsegv_b30756_3795_cov_2693691257_ansi256.ans Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d42ec8433c687fcbccefa51a7716d81920218e4f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 March 2014, 02:06:10 UTC |
| ab31a9e | Michael Niedermayer | 16 February 2014, 22:08:52 UTC | avcodec/msrle: use av_image_get_linesize() to calculate the linesize Fixes out of array access Fixes: 14a74a0a2dc67ede543f0e35d834fbbe-asan_heap-oob_49572c_556_cov_215466444_44_001_engine_room.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c919e1ca2ecfc47d796382973ba0e48b8f6f92a2) Conflicts: libavcodec/msrle.c (cherry picked from commit bc1c8ec5e65098fd2ccd8456f667151dfc9cda42) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 March 2014, 02:06:10 UTC |
| a57d29a | Michael Niedermayer | 13 February 2014, 12:59:51 UTC | avformat/mpegtsenc: Check data array size in mpegts_write_pmt() Prevents out of array writes Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 842b6c14bcfc1c5da1a2d288fd65386eb8c158ad) Conflicts: libavformat/mpegtsenc.c (cherry picked from commit e87de3f50b765134588d0b048c32ed4b8acc16fb) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 March 2014, 02:06:10 UTC |
| 11b14d0 | Michael Niedermayer | 07 February 2014, 14:07:23 UTC | avcodec/wmalosslessdec: fix mclms_coeffs* array size Fixes corruption of context Fixes: 8835659dde6a4f7dcdf341de6a45c6c8-signal_sigsegv_1dce67b_4564_cov_2504444599_classical_22_16_1_14000_v3c_0_extend_0_29.wma Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ec9578d54d09b64bf112c2bf7a34b1ef3b93dbd3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 March 2014, 02:06:10 UTC |
| bb683eb | Justin Ruggles | 30 January 2014, 19:08:38 UTC | samplefmt: avoid integer overflow in av_samples_get_buffer_size() CC:libav-stable@libav.org (cherry picked from commit 0e830094ad0dc251613a0aa3234d9c5c397e02e6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 March 2014, 02:06:10 UTC |
| b3cc4bd | Michael Niedermayer | 01 February 2014, 18:04:37 UTC | avcodec/vc1: reset fcm/field_mode in non advanced header parsing Fixes NULL pointer dereference Fixes: signal_sigsegv_1ab8bf4_2847_cov_4254117347_SA10091.vc1 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b51e9354772de446e8196dabf9aad1567b22f74d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 March 2014, 02:06:10 UTC |
| ca9d302 | Michael Niedermayer | 31 January 2014, 18:16:02 UTC | avcodec/takdec: always check bits_per_raw_sample Fixes out of array access Fixes: asan_heap-oob_19c7a94_6470_cov_1453611734_luckynight-partial.tak Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f58eab151214d2d35ff0973f2b3e51c5eb372da4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 March 2014, 02:06:10 UTC |
| e925fd2 | Michael Niedermayer | 20 January 2014, 17:08:18 UTC | avcodec/vmnc: Check that rectangles are within the picture Prevents out of array accesses with CODEC_FLAG_EMU_EDGE Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6ba02602aa7fc7d38db582e75b8b093fb3c1608d) Conflicts: libavcodec/vmnc.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7c17207ab9acfaa934e8feb8fba90765c9d0b989) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 March 2014, 02:06:10 UTC |
| 5e01cd3 | Michael Niedermayer | 17 January 2014, 19:09:48 UTC | dnxhdenc: fix mb_rc size Fixes out of array access with RC_VARIANCE set to 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f1caaa1c61310beba705957e6366f0392a0b005b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 05 March 2014, 02:06:10 UTC |
| 2256b2a | Anton Khirnov | 27 February 2014, 20:36:33 UTC | pthread_frame: flush all threads on flush, not just the first one avcodec_flush_buffers() must release all internally held references according to its documentation, for which all the threads need to be flushed. Bug-Id: vlc/9665 (cherry picked from commit d1f9563d502037239185c11578cc614bdf0c5870) Conflicts: libavcodec/pthread_frame.c | 04 March 2014, 00:39:11 UTC |
| 89c917f | Martin Storsjö | 23 January 2014, 12:07:46 UTC | rtpdec_asf: Copy the need_parsing field from the chained demuxer This fixes playback of mp3 streams in rtp/asf. This used to work until 950482bf, but mostly by coincidence. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 2aec9e228cb317cca8cda9e03986c8482ea54404) Fixes ticket #3223 | 27 January 2014, 14:48:27 UTC |
| 8a38deb | Reimar Döffinger | 16 March 2013, 12:36:20 UTC | Fix compilation on ARM with android gcc 4.7 With the current code it fails due to running out of registers. So code the store offsets manually into the assembler instead. Passes "make fate-dts". Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> (cherry picked from commit 8067f55edf3719182aed6e5b57b7863889f80218) Fixes ticket #2756. | 26 January 2014, 15:23:58 UTC |
| 4fdcb1e | Carl Eugen Hoyos | 20 January 2014, 21:37:18 UTC | Allow decoding of slightly broken Nikon avi files. Fixes ticket #3330. (cherry picked from commit f9c2d4d17e3b18becb046d71811f9e8aa5946cf9) Conflicts: libavformat/avidec.c | 20 January 2014, 21:40:36 UTC |
| b902ba4 | Michael Niedermayer | 19 January 2014, 15:44:58 UTC | avcodec/mjpegdec: Dont skip picture allocation if theres no picture allocated Fixes Ticket 3245 (cherry picked from commit ad8d063f230c05f8b5efbd05cc5a9f51a2549dcf) | 20 January 2014, 21:39:50 UTC |
| f0fabcc | Michael Niedermayer | 19 January 2014, 03:02:11 UTC | avcodec/mjpegdec: Dont treat the lack of a startcode differently from end of the bitstream Fixes Ticket3303 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 31e703e899bee74c50efd8eb62c3d012ef5ab26d) Conflicts: libavcodec/mjpegdec.c | 19 January 2014, 13:43:47 UTC |
