summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* avfilter/drawtext: fix box sizingGyan Doshi2018-07-13
| | | | | | | | | At present, box size is clipped to frame size before being drawn, which can lead to the box not fully covering animated text which is longer than one or both frame dimensions. Since ff_blend_rectangle correctly takes care of clipping, it is skipped here which results in correct box sizing
* avformat/mov: Simplify last element computation in mov_estimate_video_delay()Michael Niedermayer2018-07-13
| | | | | | Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Reviewed-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavcodec/mpegaudiodecheader.h: fix version check patternKarsten Otto2018-07-13
| | | | | | | This fixes the check for the reserved MPEG audio version ID, used to detect an invalid frame header. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mov: Break out of inner loop early in mov_estimate_video_delay()Michael Niedermayer2018-07-13
| | | | | | | | | | 0.266 <- 0.299 sec (this is time ffmpeg so containing alot other things) Sample for benchmark was: ffmpeg -f rawvideo -pix_fmt yuv420p -s 32x32 -i /dev/zero -t 24:00:00.00 out.mp4 Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Reviewed-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavc/h263dec: Remove a variable declaration that can lead to a warning.Carl Eugen Hoyos2018-07-13
|
* lavfi/convolution_opencl: use CL_FAIL_ON_ERROR for error handlingDanil Iashchenko2018-07-12
| | | | Switch to use CL_FAIL_ON_ERROR for error handling
* lavc/qsv: handle MFX_FRAMETYPE_UNKNOWN caseZhong Li2018-07-12
| | | | Signed-off-by: Zhong Li <zhong.li@intel.com>
* avformat/mov: Eliminate variable buf_size from mov_estimate_video_delay()Michael Niedermayer2018-07-12
| | | | | | Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Reviewed-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mov: remove modulo operations from mov_estimate_video_delay()Michael Niedermayer2018-07-12
| | | | | | | | 0.324 <-0.491 sec Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Reviewed-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavfi/avgblur_opencl: fix using uninitialized valueDanil Iashchenko2018-07-11
| | | | | | Fixed using uninitialized value "global_work[0]" when calling "av_log". Fixes CID #1437471.
* lavfi/vf_avgblur_opencl: remove useless clFinish().Ruiling Song2018-07-11
| | | | | | | The very last clFinish() should be ok. Signed-off-by: Ruiling Song <ruiling.song@intel.com> Reviewed-by: Danil Iashchenko <danyaschenko@gmail.com>
* lavfi/opencl: add macro for opencl error handling.Ruiling Song2018-07-11
| | | | Signed-off-by: Ruiling Song <ruiling.song@intel.com>
* avutil/pixelutils: correct the function name in commentsJun Zhao2018-07-11
| | | | Signed-off-by: Jun Zhao <mypopydev@gmail.com>
* avformat/hlsenc: improve compute after_init_list_durSteven Liu2018-07-11
| | | | | | | | | fix ticket: 7305 vs->sequence - hls->start_sequence - vs->nb_entries is the after_init_list_dur fragment numbers fix the wrong compute way vs->sequence - vs->nb_entries Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* fate: allow temp files for passed test to be keptGyan Doshi2018-07-10
| | | | | | | | Set make variable KEEP to non-zero value to preserve temp files when a test has passed. Helpful in diagnosing failed tests when test outfile is some type of single hash and does not reveal differences in processed output.
* avformat/movenc: Write version 2 of audio atom if channels is not knownMichael Niedermayer2018-07-09
| | | | | | | | | | | The version 1 needs the channel count and would divide by 0 Fixes: division by 0 Fixes: fpe_movenc.c_1108_1.ogg Fixes: fpe_movenc.c_1108_2.ogg Fixes: fpe_movenc.c_1108_3.wav Found-by: #CHEN HONGXU# <HCHEN017@e.ntu.edu.sg> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* aadec: add chapters and seekingKarsten Otto2018-07-09
| | | | | | | | | | | | | | | read_packet reads content in chunks. Thus seek must be clamped to valid chunk positions in the file, which in turn are relative to chapter start positions. So in read_header, scan for chapter headers once by skipping through the content. Set stream time_base based on bitrate in bytes/s, for easy timestamp to position conversion. Then in read_seek, find the chapter containing the seek position, calculate the nearest chunk position, and reinit the read_seek state accordingly. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavcodec/mpegaudiodecheader.h : detect reserved mpeg idKarsten Otto2018-07-09
| | | | | | | | Check the MPEG version ID for the reserved bit pattern 01, and abort the header check in that case. This reduces the chance of misinterpreting arbitrary data as a valid header, and prevents resulting audio artifacts. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavfi/minterpolate: fix blending calc issue.Jun Zhao2018-07-08
| | | | | | | the right blending calc is: (alpha * Frame_2 + (MAX - alpha) * Frame_1 + 512) >> 10 Signed-off-by: Jun Zhao <mypopydev@gmail.com>
* aadec: improve eof detectionKarsten Otto2018-07-08
| | | | | | | | | Remember the end position of audio content in the file and check it during read_packet. There always seems to be other data beyond it, which could be misinterpreted as more audio. Also add some extra avio_read error checks, to bail early in case of a broken/truncated file. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/movenc: Check input sample countMichael Niedermayer2018-07-08
| | | | | | | | | | | | | | Fixes: division by 0 Fixes: fpe_movenc.c_199_1.wav Fixes: fpe_movenc.c_199_2.wav Fixes: fpe_movenc.c_199_3.wav Fixes: fpe_movenc.c_199_4.wav Fixes: fpe_movenc.c_199_5.wav Fixes: fpe_movenc.c_199_6.wav Fixes: fpe_movenc.c_199_7.wav Found-by: #CHEN HONGXU# <HCHEN017@e.ntu.edu.sg> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mjpegdec: Check for odd progressive RGBMichael Niedermayer2018-07-08
| | | | | | | | Fixes: out of array access Fixes: 9225/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-5684770334834688 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/setpts: add FR shorthand for FRAME_RATEGyan Doshi2018-07-07
|
* libavcodec/vp8: Do not compute line pointers per pixel in fade()Michael Niedermayer2018-07-07
| | | | | | | 72->60 seconds Testcase: 8680/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP7_fuzzer-5861504418054144 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* tests/fate/demux: Add test for d25c945247979a88fac6bb3b7a26370262b96ef1Michael Niedermayer2018-07-07
| | | | | | Sample provided by Thierry for fate Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/vp8_parser: Do not leave data/size uninitializedMichael Niedermayer2018-07-07
| | | | | | | | | | | | This is identical to what the VP9 parser does Fixes: 9215/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBVPX_VP8_fuzzer-5768227253649408 Fixes: out of memory access This may also fix oss fuzz issue 9212 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* tools/target_dec_fuzzer: set parser codec id to avoid assertion failureMichael Niedermayer2018-07-07
| | | | | | | | Fixes: 9211/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_GSM_fuzzer-5680396581732352 Fixes: assertion failure Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mms: Add missing chunksize checkMichael Niedermayer2018-07-06
| | | | | | | | | | Fixes: out of array read Fixes: mms-crash-01b6c5d85f9d9f40f4e879896103e9f5b222816a Found-by: Paul Ch <paulcher@icloud.com> 1st hunk by Paul Ch <paulcher@icloud.com> Tested-by: Paul Ch <paulcher@icloud.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* configure: toolchain-tsan does not need -fPIE.Carl Eugen Hoyos2018-07-06
| | | | | | | Fixes compilation with some kernel-gcc combinations: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67308 Reported and analyzed by Gonzalo Garramuño.
* avformat/pva: Check for EOF before retrying in read_part_of_packet()Michael Niedermayer2018-07-05
| | | | | | | | Fixes: Infinite loop Fixes: pva-4b1835dbc2027bf3c567005dcc78e85199240d06 Found-by: Paul Ch <paulcher@icloud.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/rmdec: Do not pass mime type in rm_read_multi() to ↵Michael Niedermayer2018-07-05
| | | | | | | | | | ff_rm_read_mdpr_codecdata() Fixes: use after free() Fixes: rmdec-crash-ffe85b4cab1597d1cfea6955705e53f1f5c8a362 Found-by: Paul Ch <paulcher@icloud.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/asfdec_o: Check size_bmp more fullyMichael Niedermayer2018-07-05
| | | | | | | | Fixes: integer overflow and out of array access Fixes: asfo-crash-46080c4341572a7137a162331af77f6ded45cbd7 Found-by: Paul Ch <paulcher@icloud.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mxfdec: Fix av_log contextMichael Niedermayer2018-07-05
| | | | | | | | Fixes: out of array access Fixes: mxf-crash-1c2e59bf07a34675bfb3ada5e1ec22fa9f38f923 Found-by: Paul Ch <paulcher@icloud.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc/filters: state negate filter's optionGyan Doshi2018-07-05
| | | | Also clarify that the negate_alpha option is a boolean
* avcodec/mpeg4videodec: Check for bitstream end in read_quant_matrix_ext()Michael Niedermayer2018-07-04
| | | | | | | | Fixes: out of array read Fixes: asff-crash-0e53d0dc491dfdd507530b66562812fbd4c36678 Found-by: Paul Ch <paulcher@icloud.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mxfdec: add support for opAtom without indexMarton Balint2018-07-04
| | | | | | Clip wrapped code is capable of doing some magic for such files. Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mxfdec: guess constant byte count indexes based on track durationMarton Balint2018-07-04
| | | | | | | For clip wrapped essences this should work. Also, since index_edit_rate can now be different from track edit rate, remove overriding track edit rate. Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mxfdec: take into account index_edit_rateMarton Balint2018-07-04
| | | | | | | Fixes samples/ffmpeg-bugs/roundup/issue591/02785736.mxf Fixes samples/ffmpeg-bugs/trac/ticket1916/pcm_s24le_to_pcm_s16le.mxf Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mxfdec: fix indentation and rename mxf_read_packet_oldMarton Balint2018-07-04
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mxfdec: add support for clip wrapped essencesMarton Balint2018-07-04
| | | | | | | | | | Also use common code with opAtom. Fixes ticket #2776. Partially fixes ticket #5671. Fixes ticket #5866. Signed-off-by: Marton Balint <cus@passwd.hu>
* avcodec/atrac9tab: add missing header includeJames Almer2018-07-04
| | | | | | Fixes make checkheaders Signed-off-by: James Almer <jamrial@gmail.com>
* lavc/atrac9tab: Add inclusion guards.Carl Eugen Hoyos2018-07-04
| | | | Fixes fate-source.
* lavfi/weave: Refactor two near-identical clauses.Shlomi Fish2018-07-04
| | | | | | The changes contained in this patch are hereby placed under the Expat licence. Reviewed-by: Paul B Mahol
* avcodec/indeo4: Check for end of bitstream in decode_mb_info()Michael Niedermayer2018-07-04
| | | | | | | | Fixes: Timeout Fixes: 8776/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INDEO4_fuzzer-5361788798369792 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/truemotion2: Check len in tm2_read_stream()Michael Niedermayer2018-07-04
| | | | | | | Fixes: Timeout Fixes: 8774/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5942199639343104 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
* avcodec/ac3dec: Check channel_map indexMichael Niedermayer2018-07-04
| | | | | | | | Fixes: out of array read Fixes: 8924/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EAC3_fuzzer-5851861780267008 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mpeg4videodec: Remove use of FF_PROFILE_MPEG4_SIMPLE_STUDIO as ↵Michael Niedermayer2018-07-04
| | | | | | | | | | | | | | | indicator of studio profile The profile field is changed by code inside and outside the decoder, its not a reliable indicator of the internal codec state. Maintaining it consistency with studio_profile is messy. Its easier to just avoid it and use only studio_profile Fixes: assertion failure Fixes: ffmpeg_crash_9.avi Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/shorten: Fix undefined addition in shorten_decode_frame()Michael Niedermayer2018-07-04
| | | | | | | | Fixes: signed integer overflow: 1139785606 + 1454196085 cannot be represented in type 'int' Fixes: 8937/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-6202943597445120 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/shorten: Fix undefined integer overflowMichael Niedermayer2018-07-04
| | | | | | | | Fixes: signed integer overflow: 8454144 * 256 cannot be represented in type 'int' Fixes: 8788/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5728205041303552 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: Fixes invalid shifts in ↵Michael Niedermayer2018-07-04
| | | | | | | | | | jpeg2000_decode_packets_po_iteration() Fixes: shift exponent 47 is too large for 32-bit type 'int' Fixes: 9163/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5661750182543360 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>