summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/h264dec: be more explicit in handling container croppingJames Almer2017-05-26
| | | | | | | | | | | This merges commit 4fded0480f20f4d7ca5e776a85574de34dfead14 from libav, originally written by Anton Khirnov and skipped in fc63d5ceb357c4b760cb02772de0b50d0557140f. libavcodec/h264_slice.c | 20 +++++++++++++------- libavcodec/h264dec.c | 3 +++ libavcodec/h264dec.h | 5 +++++ 3 files changed, 21 insertions(+), 7 deletions(-)
* avcodec/hevcdec: export cropping information instead of handling it internallyJames Almer2017-05-26
| | | | | | | | | | | | | | | | This merges commit a02ae1c6837a54ed9e7735da2b1f789b2f4b6e13 from libav, originally written by Anton Khirnov and skipped in fc63d5ceb357c4b760cb02772de0b50d0557140f. libavcodec/hevc_parser.c | 6 ++++-- libavcodec/hevc_ps.c | 31 ++++++++++++------------------- libavcodec/hevc_ps.h | 2 -- libavcodec/hevc_refs.c | 18 +++++------------- libavcodec/hevcdec.c | 7 ++++--- libavcodec/hevcdec.h | 2 -- 6 files changed, 25 insertions(+), 41 deletions(-) Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/clearvideo: Check buf_size before decoding frameMichael Niedermayer2017-05-26
| | | | | | | | Fixes; Timeout Fixes: 1826/clusterfuzz-testcase-minimized-5728569256837120 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/aacdec_fixed: Fix runtime error: signed integer overflow: ↵Michael Niedermayer2017-05-25
| | | | | | | | | -2147483648 * -1 cannot be represented in type 'int' Fixes: 1825/clusterfuzz-testcase-minimized-6002833050566656 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/smc: Check remaining inputMichael Niedermayer2017-05-25
| | | | | | | | Fixes: Timeout Fixes: 1818/clusterfuzz-testcase-minimized-5039166473633792 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/diracdec: Fix off by 1 error in quant checkMichael Niedermayer2017-05-25
| | | | | | | | Fixes: out of array read Fixes: 1781/clusterfuzz-testcase-minimized-4617176877105152 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/diracdec: Factor quant matrix readsMichael Niedermayer2017-05-25
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* frame_thread_encoder: extend critical code covered by finished_task_mutex.Ronald S. Bultje2017-05-25
| | | | Should fix tsan errors in utvideoenc_rgb_left and related tests.
* hevc: fix race condition in max_ra/seq_decode.Ronald S. Bultje2017-05-25
| | | | | | | | | | These variables are shared between frame threads, but they are updated post-setup_finished() if a EOB/EOS slice type occurs. Moving the EOB/EOS slices to the next frame thread instance (by parsing them leading into the next picture instead of trailing behind the last picture) effectively prevents this race condition. This fixes tsan failures on hevc-conformance-NoOutPrior_A_Qualcomm_1.
* avcodec/tscc2: Skip duplicate framesMichael Niedermayer2017-05-25
| | | | | | | | | | This turns CFR duplicated frames into skiped frames Fixes: Timeout Fixes: 1719/clusterfuzz-testcase-minimized-6375090079924224 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/wavpack: Fix runtime error: left shift of negative value -14778Michael Niedermayer2017-05-25
| | | | | | | Fixes: 1778/clusterfuzz-testcase-minimized-5128953268273152 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/wavpack: Fix: runtime error: signed integer overflow: 3 * ↵Michael Niedermayer2017-05-25
| | | | | | | | | -2147483648 cannot be represented in type 'int' Fixes: 1776/clusterfuzz-testcase-minimized-6191258231898112 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/jpeg2000dec: Fix copy and paste errorMichael Niedermayer2017-05-25
| | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/audiotoolboxdec: check packet side data for AAC extradata updatesJames Almer2017-05-25
| | | | | Tested-by: rcombs Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/libopenh264dec: fix return error value when h264_mp4toannexb_bsf is ↵James Almer2017-05-24
| | | | not found
* doc/libav-merge: remove line about aac_adtstoascJames Almer2017-05-24
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* ffmpeg: remove bsf extradata propagation hackJames Almer2017-05-24
| | | | | | The offending bitstream filter was fixed, so this is no longer needed. Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/mux: remove autobsf extradata propagation hackJames Almer2017-05-24
| | | | | | The offending bitstream filter was fixed, so this is no longer needed. Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/aac_adtstoasc: propagate new extradata using packet side dataJames Almer2017-05-24
| | | | | | | | | | | | This removes the current API violating behavior of overwritting the stream's extradata during packet filtering, something that should not happen after the av_bsf_init() call. The bitstream filter generated extradata is no longer available during write_header(), and as such not usable with non seekable output. The FATE tests are updated to reflect this. Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/adtsenc: check packet side data for AAC extradata updatesJames Almer2017-05-24
| | | | | | This is in preparation for the following patch. Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/latmenc: check packet side data for AAC extradata updatesJames Almer2017-05-24
| | | | | | This is in preparation for a following patch. Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/matroskaenc: check packet side data for AAC extradata updatesJames Almer2017-05-24
| | | | | | | | | | | | This adapts and merges commit f4bf236338f6001736a4784b9c23de863057a583 from libav, originally skipped in 13a211e6320d061d9e8c29354c81239324b2db03 as it was not necessary back then. Is's applied now in preparation for the following patches, where the aac_adtstoasc bitstream filter will start to correctly propagate the new extradata through packet side data. Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/movenc: always check for new extradata on a packetJames Almer2017-05-24
| | | | | | | | Don't just look at zero sized packets, and also check for AAC extradata updates, in preparation for the following patches. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/cllc: Check bitstream end before decoding pixelsMichael Niedermayer2017-05-24
| | | | | | | | Fixes timeout Fixes: 1802/clusterfuzz-testcase-minimized-5008293510512640 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/wavpack: Fix runtime error: left shift of negative value -1Michael Niedermayer2017-05-24
| | | | | | | Fixes: 1807/clusterfuzz-testcase-minimized-6258676199325696 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/jpeg2000dec: Check tile offsetsMichael Niedermayer2017-05-24
| | | | | | | Fixes: runtime error: signed integer overflow: 4096 - -2147483648 cannot be represented in type 'int' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/sanm: Fix uninitialized reference framesMax Justicz2017-05-24
| | | | | | Fixes: poc.snm Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/jpeglsdec: Check get_bits_left() before decoding a pictureMichael Niedermayer2017-05-24
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* fate: add aac-al_sbr_ps_06_ur testJames Almer2017-05-23
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/celp_filters: Fix runtime error: signed integer overflow: 1892453989 ↵Michael Niedermayer2017-05-23
| | | | | | | | | + 381702783 cannot be represented in type 'int' Fixes: 1766/clusterfuzz-testcase-minimized-6562020075765760 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/lagarith: Fix runtime error: left shift of 1 by 31 places cannot be ↵Michael Niedermayer2017-05-23
| | | | | | | | | represented in type 'int' Fixes: 1764/clusterfuzz-testcase-minimized-5394243164045312 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/aacdec_fixed: Fix multiple runtime error: shift exponent 127 is too ↵Michael Niedermayer2017-05-23
| | | | | | | | | large for 32-bit type 'int' Fixes: 1762/clusterfuzz-testcase-minimized-5150981081792512 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavc/ffjni: add missing '\n'Matthieu Bouron2017-05-23
|
* lavc/mediacodec_wrapper: do not declare ↵Matthieu Bouron2017-05-23
| | | | JNIAMedia{Codec,CodecList,Format}Fields on the stack
* lavc/mediacodec_wrapper: fix local reference leaksMatthieu Bouron2017-05-23
|
* avcodec/fmvc: Fix use of uninitialized memory when the first frame is not a ↵Max Justicz2017-05-23
| | | | | | | | keyframe Fixes: fmvc-poc.avi Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/nvenc: remove unnecessary alignmentTimo Rothenpieler2017-05-23
| | | | Fixes #6260
* avcodec/g723_1: Fix runtime error: signed integer overflow: -1013481472 + ↵Michael Niedermayer2017-05-23
| | | | | | | | | | -1139123755 cannot be represented in type 'int' See: LsptoA() and L_add() Fixes: 1758/clusterfuzz-testcase-minimized-6054857184116736 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/ffv1dec_template: Fix runtime error: signed integer overflow: 202 + ↵Michael Niedermayer2017-05-23
| | | | | | | | | 2147483615 cannot be represented in type 'int' Fixes: 1748/clusterfuzz-testcase-minimized-6690208340770816 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/xsubdec: Check that RLE coded image and colors fit in the bufferMichael Niedermayer2017-05-23
| | | | | | | | Fixes: Timeout Fixes: 1747/clusterfuzz-testcase-minimized-6035451213250560 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/asvdec: Check buf_sizeMichael Niedermayer2017-05-22
| | | | | | | | Fixes Timeout Fixes: 1746/clusterfuzz-testcase-minimized-6687393392361472 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/takdec: Fix runtime error: signed integer overflow: 2146548196 + ↵Michael Niedermayer2017-05-22
| | | | | | | | | 2156738 cannot be represented in type 'int' Fixes: 1743/clusterfuzz-testcase-minimized-4994834022531072 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/takdec: Fix runtime error: left shift of negative value -360Michael Niedermayer2017-05-22
| | | | | | | Fixes: 1739/clusterfuzz-testcase-minimized-5399237707694080 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/takdec: Fix multiple runtime error: signed integer overflow: -512 * ↵Michael Niedermayer2017-05-22
| | | | | | | | | 4563386 cannot be represented in type 'int' Fixes: 1706/clusterfuzz-testcase-minimized-6112772670619648 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mlpdec: Fix runtime error: shift exponent -5 is negativeMichael Niedermayer2017-05-22
| | | | | | | Fixes part of 1708/clusterfuzz-testcase-minimized-5035111957397504 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/escape124: Check depth against num_superblocksMichael Niedermayer2017-05-22
| | | | | | | | Fixes: runtime error: left shift of 66184 by 15 places cannot be represented in type 'int' Fixes: 1707/clusterfuzz-testcase-minimized-6502767008940032 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/hls: do not transfer custom IO flagClément Bœsch2017-05-22
| | | | See 0dcac9c3f0f8f32009098edb704fac4b08bac951
* lavf/concatdec: do not transfer custom IO flagClément Bœsch2017-05-22
| | | | | | | If the source is using a custom IO, setting this flag causes heavy leaks since the segments will not have their avio context closed. Regression since f5da453b068f55d335ca403d2e2b4dd2ac3d4331.
* Use AVOnce as a static variable consistentlyHendrik Leppkes2017-05-22
| | | | | | | Using AVOnce as a stack variable makes no sense as the state is lost when the function exits. This fixes repeated calls to av(filter/device)_register_all
* avfilter/avf_showspectrum: properly initialize ptsPaul B Mahol2017-05-22
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>