aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ffmpeg: android: Regenerate configsHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001cm-13.0Luca Stefani2017-02-1814-54/+148
| | | | | | * Disable unneeded docs Change-Id: I77a8fd84c32c44b595cd98adccc497f1333fc447
* Revert "ffmpeg: Additional APE extradata"Steve Kondik2016-08-192-6/+2
| | | | | | This reverts commit 5934ab8cf4e7b8d3b38f9793adf7c0d54ac4331c. Change-Id: I6d0947a13f6b143fcfdef5c883b9b4881961485a
* Merge branch 'release/3.0' of https://github.com/FFmpeg/FFmpeg into cm-13.0Steve Kondik2016-08-19126-549/+1292
|\
| * avcodec/h264: Put context_count check backMichael Niedermayer2016-08-131-4/+6
| | | | | | | | | | | | | | | | Fixes assertion failure Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f883f0b0bd0dac76b58e49f5c75cf9b497eecaa0) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * Update for 3.0.3Michael Niedermayer2016-08-133-2/+69
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * cmdutils: remove the current working directory from the DLL search path on win32Hendrik Leppkes2016-08-136-0/+21
| | | | | | | | | | | | | | Reviewed-by: Matt Oliver <protogonoi@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3bf142c77337814458ed8e036796934032d9837f) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/raw: Fix decoding of ilacetest.movMichael Niedermayer2016-08-131-0/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit bbec14de3126dbc4e1ec2b32ed714dab173386aa) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/ffv1enc: Fix assertion failure with non zero bits per sampleMichael Niedermayer2016-08-131-4/+2
| | | | | | | | | | | | | | | | Fixes Ticket5736 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c1bfeda5a34631787e07702f7a3569a41751caeb) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avformat/oggdec: Fix integer overflow with invalid ptsMichael Niedermayer2016-08-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | If negative pts are possible for some codecs in ogg then the code needs to be changed to use signed values. Found-by: Thomas Guilbert <tguilbert@google.com> Fixes: clusterfuzz_usan-2016-08-02 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c5cc3b08e56fc95665977544486bd9f06e4b7a72) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * ffplay: Fix invalid array indexMichael Niedermayer2016-08-131-1/+1
| | | | | | | | | | | | | | | | Found-by: Thomas Guilbert <tguilbert@google.com> Fixes: clusterfuzz_usan-2016-08-02 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 6cd9a8b67a95a136ea15bfe3c3bab6cf5e6d1cc9) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/vp9_parser: Check the input frame sizes for being consistentMichael Niedermayer2016-08-131-0/+17
| | | | | | | | | | | | | | | | | | Suggested-by: BBB Fixed-by: BBB Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 77b0f3f26d33d4f46f274896e0583ad1f5936b7c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * libavformat/rtpdec_asf: zero initialize the AVIOContext structKacper Michajłow2016-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | This fixes crash in avformat_open_input() when accessing protocol_whitelist field. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e947b75b1c76ef6793209c2c445b8c224a28717a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * libavutil/opt: Small bugfix in example.Kacper Michajłow2016-08-131-2/+2
| | | | | | | | | | | | | | | | | | Fix const corectness and zero init the struct. This example code would actually crash when initializing string. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 69630f4d304a4e35d90957d6a170744af87cbf93) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * libx264: Increase x264 opts character limit to 4096Sasi Inguva2016-08-131-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 282477bf4534439ecb06f14d46446a4f1ab82284) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avformat/mov: Check sample sizeMichael Niedermayer2016-08-131-1/+10
| | | | | | | | | | | | | | | | | | | | | | Fixes integer overflow Fixes: poc.mp4 Found-by: ajax secure <ajax4sec@hotmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 8a3221cc67a516dfc1700bdae3566ec52c7ee823) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avformat/format: Fix registering a format more than once and related racesMichael Niedermayer2016-08-131-6/+10
| | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 4cc896ea5f06f8b1ebcde6d876d9c5b59ef9a016) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avformat/flacdec: Fix seeking close to EOFMichael Niedermayer2016-08-131-3/+6
| | | | | | | | | | | | | | | | | | Fixes Ticket5428 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d0b21b28a3d348c0302c98cee23c4820cd13e1e2) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/flac_parser: Raise threshold for detecting invalid dataMichael Niedermayer2016-08-131-2/+2
| | | | | | | | | | | | | | | | | | Fixes regression from Ticket5428 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b0b3676e136a09a13767859f429a0aa416d929cd) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avformat/flvdec: Accept last size if its off by 1Michael Niedermayer2016-08-131-1/+1
| | | | | | | | | | | | | | | | | | Fixes part of Ticket5648 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e8931d79cc4d3a807860c0d4a223a77b149d2e9e) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * tests/api/api-codec-param-test: Do not directly access caps_internalMichael Niedermayer2016-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | The caps_internal field has moved without major bump and direct access causes crashes, found when testing 3.1 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d0ee2e3ae6a7b58363b5e1ae518b242d0666f82b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec: Add avpriv_codec_get_cap_skip_frame_fill_param()Michael Niedermayer2016-08-132-0/+6
| | | | | | | | | | | | With this the use of the caps_internal from libavformat can be avoided Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avfilter/vf_telecine: Make frame writable before writing into itMichael Niedermayer2016-08-132-1/+3
| | | | | | | | | | | | | | | | | | Fixes Ticket 5627 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit fa0097e008a145ea8324879d4e24c1881bb86279) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avformat/mpegts: adjust probe score for low check_countMichael Niedermayer2016-08-131-1/+3
| | | | | | | | | | | | | | | | | | | | Fixes mis-detection of tiff as mpegts Fixes Ticket5565 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 00c4861f13d9ec302348cfa1e2d4f1c796e9e86b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/mpc8: Correct end truncationMichael Niedermayer2016-08-131-2/+6
| | | | | | | | | | | | | | | | | | Fixes Ticket5478 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b21f674876badefc68e4deecdb4a1d46de10b67c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avformat/mp3dec: Increase probe score slightly when the whole data from ↵Michael Niedermayer2016-08-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | begin to end is mp3 Improves score for 1000-frames-of-noise-encoded-with-lame.mp3 without file extension Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 5fd73948bb684efcadc1f95fd2028b58d675f3ff) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/cfhd: Set dimensions unconditionallyMichael Niedermayer2016-08-131-0/+5
| | | | | | | | | | | | | | | | | | | | Fixes Ticket5215 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 056a4ae771b00645184c639fe9fd6b7217eb6d87) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/mpegvideo: Do not clear the parse context during initMichael Niedermayer2016-08-131-3/+1
| | | | | | | | | | | | | | | | | | | | It is allocated before, this cannot work Fixes Ticket5613 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 24f513619680b5bef40b02db6ca07a8a009c2ece) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * MAINTAINERs cleanup (remove myself from things i de facto dont maintain)Michael Niedermayer2016-08-131-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | x86 is maintained entirely by others these days ML, mostly too remove myself from a few spots that have other maintainers and where i just dont know the code that well anyway to do an ideal job Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit bb5bc08ba6f88af2a4a2e00ea03261b142f79f8f) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/h264: Fix off by 1 context countMichael Niedermayer2016-08-131-6/+4
| | | | | | | | | | | | | | | | | | | | | | Fixes fate-h264-xavc-4389 with slice threads (cherry picked from commit 27c1eae55f24e9ed005a6634cd4ddd867118fa48) Conflicts: libavcodec/h264.c Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/alsdec: Check r to prevent out of array readMichael Niedermayer2016-08-131-0/+5
| | | | | | | | | | | | | | | | | | No testcase known Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c36fc857b5a8f8bdf2bcc54ce72bbf817902edcf) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/alsdec: fix max bits in ltp prefix codeUmair Khan2016-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The maximum number of bits int the prefix code for p(0) is 4. By setting it as 3, we were missing the last 0 bit. This fixes bug #4715 present on the trac. Signed-off-by: Umair Khan <omerjerk@gmail.com> Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 5d64ba9d18294a305f4f46c9a64e592dc5d34aa9) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/utils: check skip_samples signednessMichael Niedermayer2016-08-131-1/+1
| | | | | | | | | | | | | | | | | | Fixes Ticket5528 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 153ab83bd37cbbcc79d8303cc6efbf81089b8123) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avformat/mpegts: Do not trust BSSD descriptor, it is sometimes not an S302M ↵Michael Niedermayer2016-08-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | stream Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit a5eb70ad9569c62158b4b2d18f2143db791f7d27) Conflicts: libavformat/mpegts.c
| * avcodec/bmp_parser: Check fsizeMichael Niedermayer2016-08-131-1/+2
| | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 43a4276c6964a2ec57e08c3c622bb94d35c0441f) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/bmp_parser: reset stateMichael Niedermayer2016-08-131-1/+3
| | | | | | | | | | | | | | | | | | Fixes part of ticket 5598 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 37005e65eb17b1480d9e1755eeba3f50ee3b9555) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/bmp_parser: Fix remaining sizeMichael Niedermayer2016-08-131-1/+1
| | | | | | | | | | | | | | | | | | Fixes part of ticket 5598 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 250b620d296adba7bd3a3104a9c30e820fb0bc36) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/bmp_parser: Fix frame_start_found in cross frame casesMichael Niedermayer2016-08-131-1/+4
| | | | | | | | | | | | | | | | | | Fixes part of ticket 5598 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit bfe945ac3a0c328371dc4b4cc3409b7da5784cb8) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avfilter/af_amix: dont fail if there are no samples in output_frame()Michael Niedermayer2016-08-131-0/+3
| | | | | | | | | | | | | | | | | | Fixes Ticket5326 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit abc957e896beb3ce33c5691b9b3701993a381852) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avformat/allformats: Making av_register_all() thread-safe.Vivekanand2016-08-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When multiple threads tries to call av_register_all(), the first thread sets initialized to 1 and do the register process. At the same time, other thread might also call av_register_all(), which returns immediately because initialized is set to 1 (even when it has not completed registering codecs). We can avoid this problem if we set initialised to 1 while exiting from function. Github: Closes #196 (cherry picked from commit b092ee701f4d0ef2b8a4171cd38101d1ee9a1034) Conflicts: libavformat/allformats.c
| * librtmp: Avoid an infiniloop setting connection argumentsLuca Barbato2016-07-261-0/+2
| | | | | | | | | | | | | | | | The exit condition was missing. Signed-off-by: Timothy Gu <timothygu99@gmail.com> (cherry picked from commit e85d38c20a8893cb59d7c86f74481f2497882196) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
| * avformat/oggparsevp8: fix pts calculation on pages ending with an invisible ↵James Almer2016-07-251-1/+5
| | | | | | | | | | | | | | frame Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 5adfbd391847fcdaea1e9b105fae2dd90af2a733)
| * Revert "configure: Enable GCC vectorization on ≥4.9 on x86"James Almer2016-07-091-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cb8646af24bd8e9627cc5e1c62b049a00fe0b07b. This change has brough more issues than benefits, between compilation time failures depending on flags used and code miscompilation causing runtime crashes. See the "[PATCH 2/2] configure: Enable GCC vectorization on ≥4.9" thread in the ffmpeg-devel mailing list for the relevant discussion. (cherry picked from commit fd6dbc53855fbfc9a782095d0ffe11dd3a98905f)
| * avcodec/libopenjpegenc: Set numresolutions by default to a value that is not ↵Michael Niedermayer2016-07-011-1/+7
| | | | | | | | | | | | | | | | | | too large Fixes issues with libopenjpeg 2.1 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e9394ca63dab3434bc8e869de019ecd86cb604ac)
| * ffplay: Fix usage of private lavfi APITimo Rothenpieler2016-06-291-1/+1
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 1bd9fb6de59bb96144ece914643d2d205818168d)
| * tests/checkasm/checkasm: Disable checkasm_check_pixblockdsp for ppc64beMichael Niedermayer2016-06-261-1/+1
| | | | | | | | | | | | | | | | See: Ticket5508 Suggested-by: Carl Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e5d434b840404d84585456e51755e052a0fe0731)
| * avcodec/mpegvideo: Deallocate last/next picture earlierMichael Niedermayer2016-06-051-2/+2
| | | | | | | | | | | | | | | | | | | | Fixes regression with mplayers direct rendering and reduces buffer count pressure in some cases Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 39c0b22df42088cf4fb1ceb2447291c224a5c7ed) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avcodec/bmp_parser: Fix stateMichael Niedermayer2016-06-051-0/+2
| | | | | | | | | | | | | | | | | | Fixes Ticket5598 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d0388bd32e1c84a9ef87ba6c448c7fffb6a9f259) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avformat/oggparseopus: Fix Undefined behavior in oggparseopus.c and ↵Thomas Guilbert2016-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | libavformat/utils.c Fixes: usan_granule_overflow constant type fix by commiter Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 1a82d2cf8fb6a7e854e7548dfcf73c3d046b34ac) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avformat/utils: avoid overflow in compute_chapters_end() with huge durationsMichael Niedermayer2016-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes: usan_granule_overflow Found-by: Thomas Guilbert <tguilbert@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c1ed78a591f68f3c81eded0bfaac313937ffa3b6) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| * avformat/utils: avoid overflow in update_stream_timings() with huge durationsMichael Niedermayer2016-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes: usan_granule_overflow Found-by: Thomas Guilbert <tguilbert@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2be3007ed55f1513bcae3d2a076e71878f48eb03) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 21:10:25 +0000