The branch, master has been updated
via 51d3c4b4b62691736172120c5d728e6c400d69c9 (commit)
via 388e6fb3be63f88bc62ebda35ca0fc96e99ceed5 (commit)
via 56ef66d350b9184cd96cd370bf0a8444962cd0e8 (commit)
via b132c1755a5d62223d63d4296fbfa17898eeee08 (commit)
via 8988734d0905fbfedaf439179cc27fc01c5d7792 (commit)
via 51f0f2d2cf90facc45130c81e50f9f19df98b732 (commit)
via d43f19064e50380fa050f7c8d89253484f765dc3 (commit)
via 4666c1eed37385484c8e34998b3fe2e5c86d4e08 (commit)
from d19b7c283cf31c5ab510bfb8a8de1f0b80243428 (commit)
- Log -----------------------------------------------------------------
commit 51d3c4b4b62691736172120c5d728e6c400d69c9
Author: Michael Niedermayer <[email protected]>
AuthorDate: Thu Jul 3 21:05:14 2025 +0200
Commit: Michael Niedermayer <[email protected]>
CommitDate: Sun Oct 19 02:07:03 2025 +0200
tools/target_dec_fuzzer: Adjust threshold for PIXLET
Fixes: Timeout
Fixes:
425754611/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PIXLET_fuzzer-4778526102585344
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index e7db9d261c..a40dc01248 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -286,6 +286,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t
size) {
case AV_CODEC_ID_MXPEG: maxpixels /= 128; break;
case AV_CODEC_ID_NUV: maxpixels /= 128; break;
case AV_CODEC_ID_OPUS: maxsamples /= 16384; break;
+ case AV_CODEC_ID_PIXLET: maxpixels /= 1024; break;
case AV_CODEC_ID_PNG: maxpixels /= 128; break;
case AV_CODEC_ID_APNG: maxpixels /= 128; break;
case AV_CODEC_ID_QTRLE: maxpixels /= 16; break;
commit 388e6fb3be63f88bc62ebda35ca0fc96e99ceed5
Author: Michael Niedermayer <[email protected]>
AuthorDate: Thu Jul 3 20:27:15 2025 +0200
Commit: Michael Niedermayer <[email protected]>
CommitDate: Sun Oct 19 01:37:26 2025 +0200
avcodec/ffv1enc: Consider variation in slice sizes
When splitting a 5 lines image in 2 slices one will be 3 lines and thus
need more space
Fixes: Assertion sc->slice_coding_mode == 0 failed at
libavcodec/ffv1enc.c:1668
Fixes:
422811239/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-4933405139861504
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index 97b38e4d16..8e5ebe773c 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -1684,9 +1684,11 @@ size_t ff_ffv1_encode_buffer_size(AVCodecContext *avctx)
{
FFV1Context *f = avctx->priv_data;
- size_t maxsize = avctx->width*avctx->height * (1 + f->transparency);
+ int w = avctx->width + f->num_h_slices;
+ int h = avctx->height + f->num_v_slices;
+ size_t maxsize = w*h * (1 + f->transparency);
if (f->chroma_planes)
- maxsize += AV_CEIL_RSHIFT(avctx->width, f->chroma_h_shift) *
AV_CEIL_RSHIFT(f->height, f->chroma_v_shift) * 2;
+ maxsize += AV_CEIL_RSHIFT(w, f->chroma_h_shift) * AV_CEIL_RSHIFT(h,
f->chroma_v_shift) * 2;
maxsize += f->slice_count * 800; //for slice header
if (f->version > 3) {
maxsize *= f->bits_per_raw_sample + 1;
commit 56ef66d350b9184cd96cd370bf0a8444962cd0e8
Author: Michael Niedermayer <[email protected]>
AuthorDate: Thu Jul 3 18:52:08 2025 +0200
Commit: Michael Niedermayer <[email protected]>
CommitDate: Sun Oct 19 01:37:17 2025 +0200
tools/target_dec_fuzzer: Adjust threshold for CRI
Fixes: Timeout
Fixes:
421997576/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CRI_fuzzer-5335057265131520
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index 4b83e3fe83..e7db9d261c 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -230,6 +230,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t
size) {
case AV_CODEC_ID_CFHD: maxpixels /= 16384; break;
case AV_CODEC_ID_CINEPAK: maxpixels /= 128; break;
case AV_CODEC_ID_COOK: maxsamples /= 1<<20; break;
+ case AV_CODEC_ID_CRI: maxpixels /= 1024; break;
case AV_CODEC_ID_CSCD: maxpixels /= 1024; break;
case AV_CODEC_ID_DFA: maxpixels /= 1024; break;
case AV_CODEC_ID_DIRAC: maxpixels /= 8192; break;
commit b132c1755a5d62223d63d4296fbfa17898eeee08
Author: Michael Niedermayer <[email protected]>
AuthorDate: Thu Jul 3 18:38:15 2025 +0200
Commit: Michael Niedermayer <[email protected]>
CommitDate: Sun Oct 19 01:37:14 2025 +0200
tools/target_dec_fuzzer: Adjust threshold for qdraw
Fixes: Timeout
Fixes:
421954735/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QDRAW_fuzzer-4515776981172224
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index eaf7b15ae8..4b83e3fe83 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -290,6 +290,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t
size) {
case AV_CODEC_ID_QTRLE: maxpixels /= 16; break;
case AV_CODEC_ID_PAF_VIDEO: maxpixels /= 16; break;
case AV_CODEC_ID_PRORES: maxpixels /= 256; break;
+ case AV_CODEC_ID_QDRAW: maxpixels /= 256; break;
case AV_CODEC_ID_QPEG: maxpixels /= 256; break;
case AV_CODEC_ID_RKA: maxsamples /= 1<<20; break;
case AV_CODEC_ID_RSCC: maxpixels /= 256; break;
commit 8988734d0905fbfedaf439179cc27fc01c5d7792
Author: Michael Niedermayer <[email protected]>
AuthorDate: Thu Jul 3 18:32:53 2025 +0200
Commit: Michael Niedermayer <[email protected]>
CommitDate: Sun Oct 19 01:37:10 2025 +0200
tools/target_dec_fuzzer: Adjust threshold for CAVS
Fixes: Timeout
Fixes:
421951267/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CAVS_fuzzer-4766360421072896
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpe
Signed-off-by: Michael Niedermayer <[email protected]>
diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index 7853cd7ac3..eaf7b15ae8 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -225,6 +225,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t
size) {
case AV_CODEC_ID_BETHSOFTVID: maxpixels /= 8192; break;
case AV_CODEC_ID_BINKVIDEO: maxpixels /= 32; break;
case AV_CODEC_ID_BONK: maxsamples /= 1<<20; break;
+ case AV_CODEC_ID_CAVS: maxpixels /= 1024; break;
case AV_CODEC_ID_CDTOONS: maxpixels /= 1024; break;
case AV_CODEC_ID_CFHD: maxpixels /= 16384; break;
case AV_CODEC_ID_CINEPAK: maxpixels /= 128; break;
commit 51f0f2d2cf90facc45130c81e50f9f19df98b732
Author: Michael Niedermayer <[email protected]>
AuthorDate: Thu Jul 3 18:08:16 2025 +0200
Commit: Michael Niedermayer <[email protected]>
CommitDate: Sun Oct 19 01:37:06 2025 +0200
tools/target_dec_fuzzer: Adjust threshold for interplay video
Fixes: Timeout
Fixes:
421945523/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INTERPLAY_VIDEO_fuzzer-4776910965506048
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index e2fc2bff44..7853cd7ac3 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -258,6 +258,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t
size) {
case AV_CODEC_ID_INDEO4: maxpixels /= 128; break;
case AV_CODEC_ID_INDEO5: maxpixels /= 1024; break;
case AV_CODEC_ID_INTERPLAY_ACM: maxsamples /= 16384; break;
+ case AV_CODEC_ID_INTERPLAY_VIDEO: maxpixels /= 256; break;
case AV_CODEC_ID_JPEG2000: maxpixels /= 16384; break;
case AV_CODEC_ID_LAGARITH: maxpixels /= 1024; break;
case AV_CODEC_ID_LOCO: maxpixels /= 1024; break;
commit d43f19064e50380fa050f7c8d89253484f765dc3
Author: Michael Niedermayer <[email protected]>
AuthorDate: Thu Jul 3 17:08:19 2025 +0200
Commit: Michael Niedermayer <[email protected]>
CommitDate: Sun Oct 19 01:37:00 2025 +0200
MAINTAINERS: libtheoraenc seems unmaintained
See: [FFmpeg-devel] libtheora maintainer ?
Signed-off-by: Michael Niedermayer <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 3c0b277c3c..3c35a519b2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -211,7 +211,7 @@ Codecs:
libkvazaar.c Arttu Ylä-Outinen
libopenh264enc.c Martin Storsjo, Linjie Fu
libopenjpegenc.c Michael Bradshaw
- libtheoraenc.c David Conrad
+ libtheoraenc.c [0]
libvorbis.c David Conrad
libvpx* James Zern
libxavs.c Stefan Gehrer
commit 4666c1eed37385484c8e34998b3fe2e5c86d4e08
Author: Michael Niedermayer <[email protected]>
AuthorDate: Thu Jul 3 22:12:43 2025 +0200
Commit: Michael Niedermayer <[email protected]>
CommitDate: Sun Oct 19 01:32:42 2025 +0200
libavcodec/cbs_apv_syntax_template: limit tile to 2gb
We do not support larger tiles as we use signed int
Alternatively we can check this in apv_decode_tile_component() or
init_get_bits*()
or support bitstreams above 2gb length
Fixes: init_get_bits() failure later
Fixes:
421817631/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APV_fuzzer-4957386534354944
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
diff --git a/libavcodec/cbs_apv_syntax_template.c
b/libavcodec/cbs_apv_syntax_template.c
index 621595ffbf..cd26a4556c 100644
--- a/libavcodec/cbs_apv_syntax_template.c
+++ b/libavcodec/cbs_apv_syntax_template.c
@@ -263,7 +263,7 @@ static int FUNC(frame)(CodedBitstreamContext *ctx,
RWContext *rw,
CHECK(FUNC(frame_header)(ctx, rw, ¤t->frame_header));
for (int t = 0; t < priv->num_tiles; t++) {
- us(32, tile_size[t], 10, MAX_UINT_BITS(32), 1, t);
+ us(32, tile_size[t], 10, MAX_INT_BITS(32), 1, t);
CHECK(FUNC(tile)(ctx, rw, ¤t->tile[t],
t, current->tile_size[t]));
-----------------------------------------------------------------------
Summary of changes:
MAINTAINERS | 2 +-
libavcodec/cbs_apv_syntax_template.c | 2 +-
libavcodec/ffv1enc.c | 6 ++++--
tools/target_dec_fuzzer.c | 5 +++++
4 files changed, 11 insertions(+), 4 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
