RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
86,438 Commits 36 Branches 392 Tags 312 MiB
Commit Graph

86438 Commits

Author SHA1 Message Date
Michael Niedermayer ca6776a993 avcodec/libfdk-aacdec: Correct buffer_size parameter 
the timeDataSize argument to aacDecoder_DecodeFrame() seems undocumented and until
2016 04 (203e3f28fbebec7011342017fafc2a0bda0ce530) unused.
after that commit libfdk-aacdec interprets it as size in sample units and memsets that on error.
FFmpeg as well as others (like GStreamer) did interpret it as size in bytes

Fixes: 1442/clusterfuzz-testcase-minimized-4540199973421056 (This requires recent libfdk to reproduce)

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-28 03:08:33 +02:00
Michael Niedermayer 7c36ee216f avcodec/sbrdsp_template: Fix: runtime error: signed integer overflow: 849815297 + 1315389781 cannot be represented in type 'int' 
Fixes: 1770/clusterfuzz-testcase-minimized-5285511235108864

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-28 03:07:45 +02:00
Michael Niedermayer fe8c9420dd avcodec/aacps: Check border_position to be monotone 
Fixes: runtime error: left shift of negative value -67108864
Fixes: 1738/clusterfuzz-testcase-minimized-6734814327603200

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-28 03:07:02 +02:00
erankor 15bd309af8 movenc: encryption with time code track fix 
instead of deciding whether to encrypt based on the encryption scheme,
decide according to whether cenc was initialized or not.
mov_create_timecode_track calls ff_mov_write_packet with a track that
doesn't have cenc initialized.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-28 03:05:59 +02:00
Michael Niedermayer 357f2316a0 avcodec/ivi_dsp: Fix runtime error: left shift of negative value -2 
Fixes: 1839/clusterfuzz-testcase-minimized-6238490993885184

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-28 03:04:21 +02:00
Kevin Mark 114e871621 doc/filters: Clarify scale2ref example 
Signed-off-by: Kevin Mark <kmark937@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-28 02:39:08 +02:00
James Almer 24133973fc avformat/mov: add support for reading Content Light Level Box 
As defined in "VP Codec ISO Media File Format Binding v1.0"
https://github.com/webmproject/vp9-dash/blob/master/VPCodecISOMediaFileFormatBinding.md

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-05-27 16:14:24 -03:00
James Almer ab05bd6e6c avformat/mov: add support for reading Mastering Display Metadata Box 
As defined in "VP Codec ISO Media File Format Binding v1.0"
https://github.com/webmproject/vp9-dash/blob/master/VPCodecISOMediaFileFormatBinding.md

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-05-27 16:09:55 -03:00
Michael Niedermayer ac8dfcbd89 avcodec/mlpdec: Do not leave invalid values in matrix_out_ch[] on error 
Fixes: runtime error: index 12 out of bounds for type 'uint8_t [8]'
Fixes: 1832/clusterfuzz-testcase-minimized-6574546079449088

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-27 14:37:42 +02:00
Michael Niedermayer 53c0c637d3 avcodec/ra144dec: Fix runtime error: left shift of negative value -17 
Fixes: 1830/clusterfuzz-testcase-minimized-5828293733384192

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-27 13:07:35 +02:00
Michael Niedermayer 77d9889821 avcodec/pixlet: Fix runtime error: signed integer overflow: 2147483647 + 32 cannot be represented in type 'int' 
Fixes: 1829/clusterfuzz-testcase-minimized-5527165321871360

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-27 13:04:23 +02:00
Michael Niedermayer 1a36354698 avformat/mux: Fix copy an paste typo 
Found-by: Roger Scott <rscott@grammatech.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-27 04:21:34 +02:00
Vittorio Giovara 1f4454230d zscale: Add range options aliases to match scale ones 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2017-05-26 10:29:32 -04:00
Vittorio Giovara 6aafe56421 zscale: Add pixdesc-API compatible color names to filter options 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2017-05-26 10:28:50 -04:00
James Almer 5213c6d175 doc/libav-merge: remove lines about AVFrame crop fields 2017-05-26 11:22:23 -03:00
James Almer a9a6d51ca4 avcodec/theora: export cropping information instead of handling it internally 
This merges commit 1202b71269 from libav,
originally written by Anton Khirnov and skipped in
fc63d5ceb3.

 libavcodec/vp3.c | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)
 2017-05-26 11:15:45 -03:00
James Almer 07596e45c5 avcodec/h264dec: export cropping information instead of handling it internally 
This merges commit c3e84820d6 from libav,
originally written by Anton Khirnov and skipped in
fc63d5ceb3.

 libavcodec/h264_picture.c |  3 ---
 libavcodec/h264_ps.c      |  9 ---------
 libavcodec/h264_slice.c   | 25 +++++++++++++++++++------
 libavcodec/h264dec.c      | 13 +------------
 libavcodec/h264dec.h      |  9 +++++----
 5 files changed, 25 insertions(+), 34 deletions(-)
 2017-05-26 11:15:45 -03:00
James Almer 6505e8cfd0 avcodec/h264dec: be more explicit in handling container cropping 
This merges commit 4fded0480f from libav,
originally written by Anton Khirnov and skipped in
fc63d5ceb3.

 libavcodec/h264_slice.c | 20 +++++++++++++-------
 libavcodec/h264dec.c    |  3 +++
 libavcodec/h264dec.h    |  5 +++++
 3 files changed, 21 insertions(+), 7 deletions(-)
 2017-05-26 11:15:45 -03:00
James Almer 000fb61a71 avcodec/hevcdec: export cropping information instead of handling it internally 
This merges commit a02ae1c683 from libav,
originally written by Anton Khirnov and skipped in
fc63d5ceb3.

 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>
 2017-05-26 11:15:45 -03:00
Michael Niedermayer 43c394dcae avcodec/clearvideo: Check buf_size before decoding frame 
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>
 2017-05-26 01:38:03 +02:00
Michael Niedermayer 8e87d146d7 avcodec/aacdec_fixed: Fix runtime error: signed integer overflow: -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>
 2017-05-25 23:03:53 +02:00
Michael Niedermayer 356194fcb1 avcodec/smc: Check remaining input 
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>
 2017-05-25 20:08:31 +02:00
Michael Niedermayer b946bd8ef2 avcodec/diracdec: Fix off by 1 error in quant check 
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>
 2017-05-25 19:32:39 +02:00
Michael Niedermayer 6d6fc4105b avcodec/diracdec: Factor quant matrix reads 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-25 19:32:39 +02:00
Ronald S. Bultje d98f34d7d4 frame_thread_encoder: extend critical code covered by finished_task_mutex. 
Should fix tsan errors in utvideoenc_rgb_left and related tests.
 2017-05-25 10:29:07 -04:00
Ronald S. Bultje ca2209d67a hevc: fix race condition in max_ra/seq_decode. 
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.
 2017-05-25 10:29:07 -04:00
Michael Niedermayer 4dc3714c48 avcodec/tscc2: Skip duplicate frames 
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>
 2017-05-25 14:30:04 +02:00
Michael Niedermayer ea71a48c7e avcodec/wavpack: Fix runtime error: left shift of negative value -14778 
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>
 2017-05-25 14:29:54 +02:00
Michael Niedermayer 5f91786fc8 avcodec/wavpack: Fix: runtime error: signed integer overflow: 3 * -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>
 2017-05-25 14:29:51 +02:00
Michael Niedermayer 5782e0ba8c avcodec/jpeg2000dec: Fix copy and paste error 
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-25 11:29:12 +02:00
James Almer 954e2b3d34 avcodec/audiotoolboxdec: check packet side data for AAC extradata updates 
Tested-by: rcombs
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-05-25 01:26:02 -03:00
James Almer 8ea5ee10a2 avcodec/libopenh264dec: fix return error value when h264_mp4toannexb_bsf is not found 2017-05-24 23:31:59 -03:00
James Almer 94ec89eb67 doc/libav-merge: remove line about aac_adtstoasc 
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-05-24 20:28:01 -03:00
James Almer f1cdc01e72 ffmpeg: remove bsf extradata propagation hack 
The offending bitstream filter was fixed, so this is no longer needed.

Signed-off-by: James Almer <jamrial@gmail.com>
 2017-05-24 20:28:00 -03:00
James Almer 437ad467c2 avformat/mux: remove autobsf extradata propagation hack 
The offending bitstream filter was fixed, so this is no longer needed.

Signed-off-by: James Almer <jamrial@gmail.com>
 2017-05-24 20:28:00 -03:00
James Almer f63c351657 avcodec/aac_adtstoasc: propagate new extradata using packet side data 
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>
 2017-05-24 20:28:00 -03:00
James Almer 210388a197 avcodec/adtsenc: check packet side data for AAC extradata updates 
This is in preparation for the following patch.

Signed-off-by: James Almer <jamrial@gmail.com>
 2017-05-24 20:28:00 -03:00
James Almer 8b3ec51de8 avformat/latmenc: check packet side data for AAC extradata updates 
This is in preparation for a following patch.

Signed-off-by: James Almer <jamrial@gmail.com>
 2017-05-24 20:28:00 -03:00
James Almer 7631f14bb3 avformat/matroskaenc: check packet side data for AAC extradata updates 
This adapts and merges commit f4bf236338
from libav, originally skipped in 13a211e632
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>
 2017-05-24 20:27:59 -03:00
James Almer f8c73e8753 avformat/movenc: always check for new extradata on a packet 
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>
 2017-05-24 20:27:59 -03:00
Michael Niedermayer cfec0d6475 avcodec/cllc: Check bitstream end before decoding pixels 
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>
 2017-05-24 20:03:33 +02:00
Michael Niedermayer bce362d36c avcodec/wavpack: Fix runtime error: left shift of negative value -1 
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>
 2017-05-24 20:03:06 +02:00
Michael Niedermayer 89325417e7 avcodec/jpeg2000dec: Check tile offsets 
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>
 2017-05-24 19:41:15 +02:00
Max Justicz ca616b0f72 avcodec/sanm: Fix uninitialized reference frames 
Fixes: poc.snm

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-24 15:51:11 +02:00
Michael Niedermayer 4bc3008d04 avcodec/jpeglsdec: Check get_bits_left() before decoding a picture 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-24 15:51:11 +02:00
James Almer 11827ea3f0 fate: add aac-al_sbr_ps_06_ur test 
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-05-23 21:03:32 -03:00
Michael Niedermayer fb75ad79cb avcodec/celp_filters: Fix runtime error: signed integer overflow: 1892453989 + 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>
 2017-05-23 16:11:27 +02:00
Michael Niedermayer 948b54763b avcodec/lagarith: Fix runtime error: left shift of 1 by 31 places cannot be 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>
 2017-05-23 16:11:27 +02:00
Michael Niedermayer 620b452a11 avcodec/aacdec_fixed: Fix multiple runtime error: shift exponent 127 is too 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>
 2017-05-23 16:11:27 +02:00
Matthieu Bouron 37de7f7175 lavc/ffjni: add missing '\n' 2017-05-23 15:25:11 +02:00