aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/motion_est: Fix xy indexing on range violation in ff_get_best_fcode()Michael Niedermayer2022-03-281-2/+1
| | | | | | | | | This codepath seems untested, no testcases change Found-by: <mkver> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 634312a70f4d5afd40058c52b4d8eade1da07a70) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hls: Use unsigned for iv computationMichael Niedermayer2022-03-281-1/+1
| | | | | | | | | | | Fixes: signed integer overflow: 9223372036854775748 + 60 cannot be represented in type 'long' Fixes: 44417/clusterfuzz-testcase-minimized-ffmpeg_dem_HLS_fuzzer-5802443881971712 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Steven Liu <lingjiujianke@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit bf33a384995ac21aa41422c6246ebdc5d9632452) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/jpeglsdec: Increase range for N in ls_get_code_runterm() by using ↵Michael Niedermayer2022-03-281-1/+1
| | | | | | | | | | | | | | unsigned Fixes: left shift of 32768 by 16 places cannot be represented in type 'int' Fixes: Timeout Fixes: 44219/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SMVJPEG_fuzzer-4679455379947520 Fixes: 44088/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SMVJPEG_fuzzer-4885976600674304 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 6ee283d7d001cfcfec94a023e172bca731e96514) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/matroskadec: Check desc_bytesMichael Niedermayer2022-03-281-4/+8
| | | | | | | | | | Fixes: Division by 0 Fixes: 44035/clusterfuzz-testcase-minimized-ffmpeg_dem_WEBM_DASH_MANIFEST_fuzzer-4826721386364928 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 5038933977d06d1048b41d71e0ada4d1ac536ddc) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/utils: Fix invalid NULL pointer operation in ff_parse_key_value()Michael Niedermayer2022-03-281-1/+1
| | | | | | | | | | Fixes: pointer index expression with base 0x000000000000 overflowed to 0xffffffffffffffff Fixes: 44012/clusterfuzz-testcase-minimized-ffmpeg_dem_HLS_fuzzer-5670607746891776 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 59328aabd2c789ae053e18a62a20a7addfd4d069) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/matroskadec: Fix infinite loop with bz decompressionMichael Niedermayer2022-03-281-2/+2
| | | | | | | | | | | | | The same check is added to zlib too, it seems not needed there though Fixes: Infinite loop Fixes: 43932/clusterfuzz-testcase-minimized-ffmpeg_dem_MATROSKA_fuzzer-6175167573786624 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 9c3d2cbb510674226b0c8fa6b146bf891f83786c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/utils: keep chapter monotonicity on chapter updatesMichael Niedermayer2022-03-281-1/+2
| | | | | | | | | | | Updating a chapter with the same id does not break monotonicity Fixes: Timeout Fixes: 43727/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-4960623367159808 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 948c26209979cef9d052531fcf9f1281cd8e0213) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mov: Check size before subtractionMichael Niedermayer2022-03-281-0/+2
| | | | | | | | | | Fixes: signed integer overflow: -9223372036854775808 - 8 cannot be represented in type 'long' Fixes: 43542/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5237670148702208 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d8d9d506a3de976b647bcbb8f76c7b8d30eff576) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/cfhd: Avoid signed integer overflow in coeffMichael Niedermayer2022-03-281-2/+2
| | | | | | | | | | Fixes: signed integer overflow: 15244032 * 256 cannot be represented in type 'int' Fixes: 43504/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CFHD_fuzzer-4865014842916864 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit cd6ac013a00373126bf3d313743d39b5edd5428a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failureJames Almer2022-02-011-1/+3
| | | | | | | | | We still own it on failure, and there's no point trying to feed it again. This should address the issue reported in dav1d #383 and part of VLC #26259. Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
* avcodec/h264_parser: don't alter decoder private dataJames Almer2022-01-251-5/+2
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* configure: link to libatomic when it's presentAnton Khirnov2022-01-211-9/+16
| | | | | | | | | | C11 atomics in some configurations (e.g. 64bit operations on ppc64 with GCC) require linking to libatomic. Fixes #9275 (cherry picked from commit 2f0a214a6202516b4dda2bb22b6b3ac20e465d6d) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* fate/ffmpeg: add missing samples dependency to fate-shortestJames Almer2022-01-161-1/+1
| | | | | Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit b1ef5882e35d1a95e9c4838d0933084773055345)
* RELEASE_NOTES: Based on the version from 4.3n5.0Michael Niedermayer2022-01-141-0/+15
| | | | | | Name suggested by jb and Reto Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* vf_tonemap: Fix order of planesVittorio Giovara2022-01-141-7/+8
| | | | | | | | | | This resulted in a dimmed tonemapping due to bad resulting luma calculation. Found by: Derek Buitenhuis Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> (cherry picked from commit 7d377558a6c5f7e0592487f38bb76a8b99aada7a)
* avfilter/vpp_qsv: fix regression on older api versions (e.g. 1.11)softworkz2022-01-141-12/+47
| | | | | | | | | | | | | Commit 8b83dad82512a6948b63408f964463b063ad24c9 introduced a regression in a way that scaling via vpp_qsv doesn't work any longer for devices with an MSDK runtime version lower than 1.19. This is true for older CPUs which are stuck at 1.11. The commit added checks for the compile-sdk version but it didn't test for the runtime version. Signed-off-by: softworkz <softworkz@hotmail.com> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com> (cherry picked from commit 479f3c65986fca0ccf56f4dadb5a5b167f466fc7)
* avformat/rawvideodec: check packet sizeMichael Niedermayer2022-01-131-0/+7
| | | | | | | | | | | | | Fixes: division by zero Fixes: integer overflow Fixes: 43347/clusterfuzz-testcase-minimized-ffmpeg_dem_V210X_fuzzer-5846911637127168 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: lance.lmwang@gmail.com Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c36a5dfc8f68316f93d03081e5a367b04e1cbd3c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/apedec: Fix integer overflows in predictor_update_3930()Michael Niedermayer2022-01-131-8/+8
| | | | | | | | | | Fixes: signed integer overflow: 1074134419 - -1075212485 cannot be represented in type 'int' Fixes: 43273/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-4706880883130368 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 0c9c9bbd01bd82c35b6a908592d9dd6d9f4bd4a0) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avutil/parseutils: use quadhd for Quad HDLimin Wang2022-01-121-1/+1
| | | | | | | | | qHD is 960x540 (q stands for quarter) and QHD is 2560x1440 (Q is quad). use quadhd for QHD for abbreviation. Fix ticket#9591 Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
* lavf/udp: do not return an uninitialized value from udp_open()Anton Khirnov2022-01-111-2/+6
| | | | | (cherry picked from commit 3c2b67446875f925909fa33d8ee14264e11c293d) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* fftools/cmdutils: Fix undefined 1 << 31Andreas Rheinhardt2022-01-111-1/+1
| | | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit bbf00916e45ac8754f208c0584834cb330a89da2)
* avcodec/libdav1d: explicitly set Dav1dSettings.apply_grainJames Almer2022-01-101-2/+2
| | | | | | | Don't depend on its default value being 1, as that could change anytime. Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 6c4074e4234edacfb3f37184fd68771df3cb2b7f)
* avcodec/nvenc: zero-initialize NV_ENC_REGISTER_RESOURCE structTimo Rothenpieler2022-01-101-1/+1
|
* avformat/movenc: fix duration in mdhd boxZhao Zhili2022-01-105-5/+5
| | | | | | | | mvhd and tkhd present the post-editlist duration, while mdhd should have the pre-editlist duration. Regression since c2424b1f3. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit f37e66b3937a914e16d89a9050f042ad89567245)
* lavfi/vf_libplacebo: fix side data stripping logicNiklas Haas2022-01-101-9/+12
| | | | | | | | | | | | This was accidentally comparing s->colorspace against out->colorspace, which is wrong - the intent was to compare in->colorspace against out->colorspace. We also forgot to strip mastering metadata. Finally, the order is sort of wrong - we should strip this side data *before* process_frames, because otherwise it may end up being seen and used by libplacebo. Signed-off-by: Niklas Haas <git@haasn.dev>
* avformat/amr: Return error upon errorAndreas Rheinhardt2022-01-091-1/+1
| | | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit abc7d1c697e0dbe463ca6632e45142ae72d139a9)
* avformat/mxfdec: support MCA audio informationMarc-Antoine Arnaud2022-01-092-6/+285
| | | | | | | | Channel reordering is removed from this patch because the new channel layout API will support it properly. Signed-off-by: Marton Balint <cus@passwd.hu> (cherry picked from commit 47c4df2203f774f6a62391e1de770cf5b9dddcbd)
* avcodec/v4l2_context: send start decode command after dynamic resolution ↵Ming Qian2022-01-091-0/+18
| | | | | | | | | | | | | | | | | | | change event Fixes decoding of sample https://streams.videolan.org/ffmpeg/incoming/720p60.mp4 on RPi4 after kernel driver commit: staging: bcm2835-codec: Format changed should trigger drain Reference: linux/Documentation/userspace-api/media/v4l/dev-decoder.rst "A source change triggers an implicit decoder drain, similar to the explicit Drain sequence. The decoder is stopped after it completes. The decoding process must be resumed with either a pair of calls to VIDIOC_STREAMOFF and VIDIOC_STREAMON on the CAPTURE queue, or a call to VIDIOC_DECODER_CMD with the V4L2_DEC_CMD_START command." Reviewed-by: Andriy Gelman <andriy.gelman@gmail.com> Signed-off-by: Ming Qian <ming.qian@nxp.com>
* avcodec/v4l2_context: don't reinit output queue on dynamic resolution change ↵Ming Qian2022-01-091-25/+2
| | | | | | | | | | | | | | | | | event Reference: linux/Documentation/userspace-api/media/v4l/dev-decoder.rst "During the resolution change sequence, the OUTPUT queue must remain streaming. Calling VIDIOC_STREAMOFF() on the OUTPUT queue would abort the sequence and initiate a seek. In principle, the OUTPUT queue operates separately from the CAPTURE queue and this remains true for the duration of the entire resolution change sequence as well." Reviewed-by: Andriy Gelman <andriy.gelman@gmail.com> Signed-off-by: Ming Qian <ming.qian@nxp.com>
* avformat/hlsenc: convey stream id to segment streamsGyan Doshi2022-01-091-0/+1
|
* avformat/matroskaenc: Disable MKV-only code if MKV muxer is disabledAndreas Rheinhardt2022-01-083-42/+60
| | | | | | | | | The Matroska muxer has quite a lot of dependencies and lots of them are unnecessary for WebM. By disabling the Matroska-only code at compile time one can get rid of them. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit 52c1e9e530a46ba62b974f121c9d28a86900a632)
* fate/subtitles: Fix check for fate-binsub-mksenc testAndreas Rheinhardt2022-01-081-1/+1
| | | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit e852b1b0631c14c81d49230931fac4593e7467e1)
* avformat/matroskaenc: Move AAC extradata check to other audio checksAndreas Rheinhardt2022-01-081-7/+6
| | | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit d266bf17988271d529fd2209681889a78b9f259c)
* avdevice/iec61883: #if unused code away, fix -O0 compilationAndreas Rheinhardt2022-01-081-1/+2
| | | | | | | | | | | | | iec61883_parse_queue_hdv() is only called when the mpegts-demuxer is available and can be optimized away when not. Yet this optimization is not a given and it fails with e.g. GCC 11 when using -O0 in which case one will get a compilation error because the call to the unavailable avpriv_mpegts_parse_packet() is not optimized away. Therefore #if the offending code away in this case. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit ad0b4afec57381c74f57dd3f3c65c49cc406c9fd)
* configure: Let decklink indev suggest libzvbiAndreas Rheinhardt2022-01-081-0/+1
| | | | | | | | | Fixes build errors if libzvbi is enabled while libzvbi_teletextdec is disabled. Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit 2d0b17e820b84cceb95c29557e168a6ef98d4ce1)
* avformat/rtsp: #if unused functions away, fix -O0 compilationAndreas Rheinhardt2022-01-081-0/+4
| | | | | | | | | | | | parse_rtsp_message() is only called if the rtsp demuxer is enabled and so it is normally compiled away if said demuxer is disabled. Yet this does not happen when compiling with -O0 and this leads to a linking failure because parse_rtsp_message() calls functions that may not be available if the rtsp demuxer is disabled. Fix this by properly #if'ing the unused functions away. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit aeb5d943c613f50611ca49f5ffbfa8b24820b61d)
* avformat/Makefile: Add entries for CRI, GEM and PGX image pipe demuxersAndreas Rheinhardt2022-01-081-0/+3
| | | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit 99f3fb8ea1d0f67c7fd0fda2fce136b5c71fc65e)
* avformat/Makefile: Add missing alp-muxer->rawenc.o dependencyAndreas Rheinhardt2022-01-081-1/+1
| | | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit 1beeeaf23ddb1630a66ec762a2270e46b76000d0)
* avformat/amr: Fix writing AMR headerAndreas Rheinhardt2022-01-081-2/+2
| | | | | | | Regression since f282c34c009e3653ec160c3880e64fc1a9300d0e. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit a22a71eb2c633335a037983fda0badc1863fc529)
* avformat/amr: Don't reset AVFormatContext.priv_dataAndreas Rheinhardt2022-01-081-2/+0
| | | | | | | | | The AMR muxer doesn't have a private context, so it's priv_data will be NULL. If it weren't, simply setting it to NULL would lead to a memleak. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit a5a99cc11c7aea587c871d6ca3fc80d9f9828e27)
* avformat/Makefile, amr: Add missing amr-demuxers->rawdec.o dependencyAndreas Rheinhardt2022-01-082-4/+4
| | | | | | | | | | Forgotten in 1f447fd95463bbf39a78d886359a3006d82f6a94. Also only enable amr_probe() and amr_read_header() in case the AMR demuxer is enabled; this avoids having to add a rawdec.o dependency to the muxer. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit 78a840e7a3b6c4b8d4f665208d4ef4506ef9f5b5)
* avformat/Makefile: Add missing libamqp->urldecode dependencyAndreas Rheinhardt2022-01-081-1/+1
| | | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit 5bdd8e67e65db3fd623b1f6835eb8942f3a469bf)
* lavc/av1dec: use frame split bsfFei Wang2022-01-081-0/+1
| | | | | | | | | | Split packed data in case of its contains multiple show frame in some non-standard bitstream. This can benefit decoder which can decode continuously instead of interrupt with unexpected error. Signed-off-by: Fei Wang <fei.w.wang@intel.com> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com> (cherry picked from commit 7787cca18016c1f8100ab158f3479ba4b7e70467)
* aarch64: Disable ff_hevc_sao_band_filter_8x8_8_neon out of precautionMartin Storsjö2022-01-071-1/+5
| | | | | | | | | | | While this function on its own passes all of fate-hevc, there's indications that the function might need to handle widths that aren't a multiple of 8 (noted in commit f63f9be37c799ddc835af358034630d31fb7db02, which later was reverted). Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 24b93022fee322c7a17e326e2d162a1fbc3698ee)
* avformat/matroskaenc: Fix build with only WebM muxer enabledAndreas Rheinhardt2022-01-071-0/+2
| | | | | | | | | | In this case ff_isom_put_dvcc_dvvc() might not be available, leading to linking failures. Given that WebM currently doesn't support DOVI, this is fixed by #if'ing the offending code away if the Matroska muxer is not enabled. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit 217c90aac70af35e34381d7a99b4407686a3f47b)
* configure: Add missing AMV muxer->riffenc dependencyAndreas Rheinhardt2022-01-071-0/+1
| | | | | | Reviewed-by: Zane van Iperen <zane@zanevaniperen.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit 41c62207f641b5cf3ae656068652f7dc958d5e79)
* avformat/Makefile: Fix name of PhotoCD demuxerAndreas Rheinhardt2022-01-071-1/+1
| | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit 6e163619e3e46e719903de3271e8c1b850b7d501)
* avcodec/libdav1d: honor the requested strict_std_compliance level on ↵James Almer2022-01-061-0/+3
| | | | | | | supported builds Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 3e17e0e5eff896f43654635bd3219da56f807f11)
* configure: Add missing libshine->mpegaudioheader dependencyAndreas Rheinhardt2022-01-061-1/+1
| | | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit e228d7b0db7d6cb02a73bee6d3bf4f6ecf92d0bf)
* avcodec/Makefile: Add missing entry for ADPCM_IMA_AMV_ENCODERAndreas Rheinhardt2022-01-061-0/+1
| | | | | | | | Forgotten in 555f5c1fc5ae0c4e7b0431dc3166c3fcf3f4e979. Reviewed-by: Zane van Iperen <zane@zanevaniperen.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> (cherry picked from commit df4cb384fb68454e23f8cc2b369e344c1bd8be7d)