summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/vdpau_mpeg4: fix order of quant matrix coefficientsrelease/6.0Hendrik Leppkes2023-05-151-2/+3
| | | | | | The matrix coefficients are stored permutated for the IDCT, rather then in plain raster order, and need to be un-permutated for the hardware.
* avcodec/vdpau_mpeg12: fix order of quant matrix coefficientsHendrik Leppkes2023-05-151-2/+3
| | | | | | The matrix coefficients are stored permutated for the IDCT, rather then in plain raster order, and need to be un-permutated for the hardware.
* avcodec/nvdec_mpeg4: fix order of quant matrix coefficientsHendrik Leppkes2023-05-151-2/+3
| | | | | | The matrix coefficients are stored permutated for the IDCT, rather then in plain raster order, and need to be un-permutated for the hardware.
* avcodec/nvdec_mpeg2: fix order of quant matrix coefficientsHendrik Leppkes2023-05-151-2/+3
| | | | | | The matrix coefficients are stored permutated for the IDCT, rather then in plain raster order, and need to be un-permutated for the hardware.
* fftools/ffmpeg_filter: fix leak of AVIOContext in read_binary()James Almer2023-04-281-3/+5
| | | | | | | | It was only being freed on failure. Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 1b7c13e1a437d7db84a206e5c55b0e0aa95760ec)
* fftools/ffmpeg: avoid possible invalid reads with short -tag valuesAnton Khirnov2023-04-172-4/+11
| | | | | | | Fixes #10319 and #10309. (cherry picked from commit 89c9a3ac3542c3684e511607d88b265bfa6aa64f) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* avcodec/mp_cmp: reject invalid comparison function valuesJames Almer2023-04-166-12/+26
| | | | | | | Fixes tickets #10306 and #10318. Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 7c6e26a18403376987541f1ca801ae225f8ee6d4)
* avcodec/aacpsy: clip global_quality within the psy_vbr_map array boundariesJames Almer2023-04-161-1/+1
| | | | | | | Fixes ticket #10317. Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 5cda6b94f45c347805cbd5a0c7ed1d712b5722d7)
* avutil/wchar_filename: propagate MultiByteToWideChar() and ↵James Almer2023-04-161-2/+4
| | | | | | | | | WideCharToMultiByte() failures Don't return success if the string could not be converted. Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 92885f26817b6b2515ac9fd5410c9e8be64bd0c0)
* avformat/concatf: check if any nodes were allocatedJames Almer2023-04-161-0/+2
| | | | | | | Fixes ticket #10304 Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 19c2dc677f81c940aebe63ed09dacf5c725f0b35)
* avcodec/nvenc: fix b-frame DTS behavior with fractional frameratesKyle Manning2023-04-031-1/+2
| | | | | | | | When using fractional framerates (or any fraction with a numerator != 1), DTS values for packets would be calculated incorrectly. Signed-off-by: Kyle Manning <tt2468@irltoolkit.com> Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
* avcodec/vorbisdec: export skip_samples instead of dropping framesJames Almer2023-03-221-8/+3
| | | | | | | | | | | | | | | pts may not be set on input packets, which could result in the entire stream being discarded. This reverts commit 8fc2dedfe6e8fcc58dd052bf3b85cd4754133b17, reintroducing the behavior it replaced but now allowing the caller to manually drop the preroll samples by looking at the skip_samples side data at the start while ignoring it on seek, by setting the skip_manual avctx flag. Fixes ticket #10251. Suggested-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit cbcc817353a019da4332ad43deb7bbc4e695d02a)
* fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsingAnton Khirnov2023-03-201-1/+1
| | | | | | | Fixes #10243 (cherry picked from commit 1e406692e5a1e6d9ca852f746088a5610ff80d14) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* lavfi/vf_vpp_qsv: set the right timestamp for AVERROR_EOFHaihao Xiang2023-03-201-0/+1
| | | | | | | | | Rescale the timestamp for AVERROR_EOF. This can fix tickets 10261 and 10262. Tested-by: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com> (cherry picked from commit 57afccc0ef8d3024ffb2d1b2d25c9670b9501248)
* avfilter/vf_untile: swap the chroma shift values used for plane offsetsJames Almer2023-03-161-2/+2
| | | | | | | Fixes ticket #10265 Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit dc61d5cf195bc6de9263883c42a58348863e6d4f)
* lavc/decode: stop mangling last_pkt_props->opaqueAnton Khirnov2023-03-111-3/+3
| | | | | | | | | | | | It is currently abused to store packet size, which breaks AV_CODEC_FLAG_COPY_OPAQUE. Use stream_index instead, which is unused in libavcodec and has the same type as size. Found-by: Martin Storsjö (cherry picked from commit a3bf63c26e6197a9b6e490538667368530a9dcd3) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* avcodec/nvenc: avoid failing b_ref_mode check when unsetTimo Rothenpieler2023-03-101-4/+6
|
* lavu/vulkan: fix handle type for 32-bit targetsKacper Michajłow2023-03-102-1/+5
| | | | | | | | | Fixes compilation with clang which errors out on Wint-conversion. Signed-off-by: Kacper Michajłow <kasper93@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit cc76e8340d28438c1ac56ee7dfd774d25e944264) Signed-off-by: Martin Storsjö <martin@martin.st>
* vulkan: Fix win/i386 calling conventionMartin Storsjö2023-03-101-4/+4
| | | | | | | | | | | | | This fixes the following error when compiling with a modern version of Clang for Windows/i386: src/libavutil/hwcontext_vulkan.c:738:32: error: incompatible function pointer types initializing 'PFN_vkDebugUtilsMessengerCallbackEXT' (aka 'unsigned int (*)(enum VkDebugUtilsMessageSeverityFlagBitsEXT, unsigned int, const struct VkDebugUtilsMessengerCallbackDataEXT *, void *) __attribute__((stdcall))') with an expression of type 'VkBool32 (VkDebugUtilsMessageSeverityFlagBitsEXT, VkDebugUtilsMessageTypeFlagsEXT, const VkDebugUtilsMessengerCallbackDataEXT *, void *)' (aka 'unsigned int (enum VkDebugUtilsMessageSeverityFlagBitsEXT, unsigned int, const struct VkDebugUtilsMessengerCallbackDataEXT *, void *)') [-Wincompatible-function-pointer-types] .pfnUserCallback = vk_dbg_callback, ^~~~~~~~~~~~~~~ Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit f9620d74cd49c35223304ba41e28be6144e45783) Signed-off-by: Martin Storsjö <martin@martin.st>
* avfilter/graphparser: fix filter instance name when an id is providedJames Almer2023-03-061-3/+4
| | | | | | | | | | Restores the behavior of naming the instance filter@id, which was accidentally changed to simpy id in commit f17051eaae. Fixes ticket #10226. Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 2fd86d9afadf9b62c2e900505558141a35e2ed6f)
* avcodec/aacps_tablegen: fix build error after avutil bumpZhao Zhili2023-03-021-1/+1
| | | | | | | | | | Fix tickets #10225 DECLARE_ALIGNED has been moved to mem_internal.h. Signed-off-by: Zhao Zhili <zhilizhao@tencent.com> Reviewed-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 814178f92647be2411516bbb82f48532373d2554)
* avcodec/nvenc: fix potential NULL pointer dereferenceZhao Zhili2023-02-281-2/+7
| | | | Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
* RELEASE_NOTES: Based on the version from 5.1n6.0Michael Niedermayer2023-02-261-0/+15
| | | | | | Name suggested by Niklas Haas Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/motionpixels: Mask pixels to valid valuesMichael Niedermayer2023-02-251-1/+1
| | | | | | | | | | Fixes: out of array access Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MOTIONPIXELS_fuzzer-6724203352555520 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 ac6eec1fc258efce219e4fccb84312a1b13a7a23) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/xpmdec: Check size before allocation to avoid truncationMichael Niedermayer2023-02-251-0/+3
| | | | | | | | | | | Fixes:OOM Fixes:out of array access (no testcase) Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XPM_fuzzer-6573323838685184 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 95f0f84dae4f040d91f1e60dc5438612c58e8906) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/bink: Avoid undefined out of array end pointers in binkb_decode_plane()Michael Niedermayer2023-02-251-4/+4
| | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit ea9deafd3b13233802c4548c4c58a707d76805a3) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/bink: Fix off by 1 error in ref endMichael Niedermayer2023-02-251-1/+1
| | | | | | | | | | | | | | Fixes: out of array access Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINK_fuzzer-6657932926517248 Alterantivly to this it is possibly to allocate a bigger array Note: oss-fuzz assigned this issue to a unrelated theora bug so the bug number matches that 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 49487045dde6f69194332aac51fd4e598e19c7b6) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/utils: Ensure linesize for SVQ3Michael Niedermayer2023-02-251-0/+3
| | | | | | | | | | Fixes: Assertion block_w * sizeof(uint8_t) <= ((buf_linesize) >= 0 ? (buf_linesize) : (-(buf_linesize)) Fixes: 54861/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SVQ3_fuzzer-5352418248622080 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 4eef658ca59d3d6ba46ab52a36d7faf5fe820874) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/utils: allocate a line more for VC1 and WMV3Michael Niedermayer2023-02-251-0/+1
| | | | | | | | | | | | | | Fixes: out of array read on 32bit Fixes: 54857/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VC1_fuzzer-5840588224462848 The chroma MC code reads over the currently allocated frame. Alternative fixes would be allocating a few bytes more at the end instead of a whole line extra or to adjust the threshold where the edge emu code is activated 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 01636a63d452c592ece35af6f72bb7affcad58f2) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/videodsp_template: Adjust pointers to avoid undefined pointer thingsMichael Niedermayer2023-02-251-2/+2
| | | | | | | | | | Fixes: subtraction of unsigned offset from 0xf6602770 overflowed to 0xf6638c80 Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_THEORA_fuzzer-495074400600064 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 f0150cd41c2d3c01050a6c4f3df1de511a217913) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/pngdec: dont skip/read chunk twiceMichael Niedermayer2023-02-251-0/+1
| | | | | | | | | | Fixes: out of array access Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PNG_fuzzer-6668158952144896.fuzz 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 df1a38d5200e14a29903f1027b4548d595c7ff8a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/pngdec: Check deloco index more exactlyMichael Niedermayer2023-02-251-1/+1
| | | | | | | | | | | | Fixes: out of array access: Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PNG_fuzzer-6716193709096960 Alternatively it should be possible to limit this to 3 plane RGB 8 /16bit to ensure the size is what it should be 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 d5bae704068dc37191280e024eecb8d02b762b28) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/wavarc: Check if extradata has been fully readMichael Niedermayer2023-02-251-1/+4
| | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2df271c78cd4b7d481a2d34abb71a2450b43c7e2) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/wavarc: Check kMichael Niedermayer2023-02-251-0/+4
| | | | | | | | | | Fixes: Assertion failure Fixes: 55849/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-6590105973555200 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 4dee46426e6d23adda048414433c2887314a4267) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/ffv1dec: Check that num h/v slices is supportedMichael Niedermayer2023-02-251-0/+5
| | | | | | | | | | Fixes: out of array access Fixes: 55597/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-4898293416329216 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 8ead0ae68eb64ad325efafd686c434727f3d666a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/rka: avoid undefined doubling sum overflowMichael Niedermayer2023-02-251-1/+1
| | | | | | | | | | Fixes: signed integer overflow: -2124073172 * 2 cannot be represented in type 'int' Fixes: 56099/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RKA_fuzzer-4530933127839744 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 a02e45a1f3cc6f07c7437c1e225dea2683f843cf) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/rka: avoid negative value shiftMichael Niedermayer2023-02-251-1/+1
| | | | | | | | | | Fixes: left shift of negative value -81 Fixes: 56061/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RKA_fuzzer-4649758062149632 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 a5d4e7e3f981ce90b92a9da7da26a3c2a2e061e9) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/rka: check for size 1 filterMichael Niedermayer2023-02-251-1/+1
| | | | | | | | | | | | Such filters will not advance and be stuck in the current implementation Fixes: Infinite loop Fixes: 56052/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RKA_fuzzer-5236218750435328 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 8874cfa2e174cf1a94123fc2f1a3aa4d307a270f) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/rka: Fix some integer anomaliesMichael Niedermayer2023-02-251-3/+3
| | | | | | | | | | | Fixes: left shift of negative value -3201 Fixes: integer overflow: -76470276 * -25608 cannot be represented in type 'int' Fixes: 56052/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RKA_fuzzer-5236218750435328 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 d495747a9fc5fb8dcac4b23c5bdca3c5c16dd152) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/rka: Fix 1/0 with bps=1Michael Niedermayer2023-02-251-1/+1
| | | | | | | | | | | | | | Fixes: division by zero Fixes: 55940/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-6333107679920128 The decoder does not support bps=1 and i have no such sample so it is not known if this duration is correct. Alternatively we could error out on all bps we currently do not support on the decoder side or not set duration. 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 b3df7ca748bf28e41a6fcb6792b485d8eb04b36a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mov: Check samplesize and offset to avoid integer overflowMichael Niedermayer2023-02-251-0/+7
| | | | | | | | | | Fixes: signed integer overflow: 9223372036854775584 + 536870912 cannot be represented in type 'long' Fixes: 55844/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-510613920664780 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 53c1f5c2e28e54ea8174b196d5cf4a158907395a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mpegtsenc: re-emit extradata ahead of IDR pictures even if AUD is ↵John Coiner2023-02-191-7/+41
| | | | | | | | | | | | | | | | | | | already present Current mpegtsenc code only inserts SPS/PPS from extradata before IDR frames if AUD is also inserted. Unfortunately some encoders may preface a key frame with an AUD, but no SPS/PPS. In that case current code does not repeat the "extradata" and the resulting HLS stream may become noncompliant and unjoinable. Fix this by always inserting SPS/PPS and moving AUD to the beginning of the packet if it is already present. Fixes ticket #10148. Signed-off-by: Marton Balint <cus@passwd.hu> (cherry picked from commit e0cb89c354ea654bccc524a8a45321b93cb256d3)
* doc: remove docs for options removed at the bumpMarton Balint2023-02-193-27/+0
| | | | | Signed-off-by: Marton Balint <cus@passwd.hu> (cherry picked from commit 3807fbd90ab9c5125d21b39017ec48d40d3f019f)
* avfilter/af_pan: use the new swr used channel layout optionJames Almer2023-02-191-1/+1
| | | | | | | Fixes ticket #10180 Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 4561232b1a36b7f8532c7939e4a508734053f6f0)
* swresample/swresample: add a used channel layout option using the new APIJames Almer2023-02-196-29/+46
| | | | | | | Replaces the "used channel count" option, which is now deprecated. Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 223c70cf1d8b816b59dede36a21492d7e8542e06)
* doc/resampler.texi: add missing swr channel layout optionsJames Almer2023-02-191-12/+2
| | | | | Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 1d14959f12ffd720377684af830a51d0cdb2aa8c)
* Update things for 6.0Michael Niedermayer2023-02-192-2/+2
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc/APIchanges: Add 6.0 cut pointMichael Niedermayer2023-02-191-0/+2
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* version.h: Bump minor for 6.0 branchMichael Niedermayer2023-02-198-8/+8
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc/APIchange: fill in missing thingsMichael Niedermayer2023-02-191-28/+28
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>