July 2025 - ffmpeg-devel - lists.ffmpeg.org

[PATCH 1/1] libavformat/mov.c : rm 'statement will never be executed' warning
by zhaozhenghang 30 Jul '25

30 Jul '25

When CONFIG_H261_DECODER, CONFIG_H263_DECODER, and CONFIG_MPEG4_DECODER are set to 0 by default, resulting in a "statement will never be executed" warning during compilation. To enhance code robustness, this patch fixes the warning. Signed-off-by: zhaozhenghang <15083277223(a)163.com> --- libavformat/mov.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 8f1c5df3c9..cd8cd282c9 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5225,18 +5225,14 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) } switch (st->codecpar->codec_id) { -#if CONFIG_H261_DECODER case AV_CODEC_ID_H261: -#endif -#if CONFIG_H263_DECODER case AV_CODEC_ID_H263: -#endif -#if CONFIG_MPEG4_DECODER case AV_CODEC_ID_MPEG4: -#endif st->codecpar->width = 0; /* let decoder init width/height */ st->codecpar->height= 0; break; + default: + break; } // If the duration of the mp3 packets is not constant, then they could need a parser -- 2.50.1.windows.1

1 0

[PATCH 1/1] libavformat/img2enc.c: rm warning ‘.tmp’ directive output may be truncated
by Cai Fan 30 Jul '25

30 Jul '25

Signed-off-by: Cai Fan <caifan0425(a)163.com> --- libavformat/img2enc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 41638d92b8..f7d983ec54 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -180,6 +180,11 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) } for (i = 0; i < 4; i++) { av_dict_copy(&options, img->protocol_opts, 0); + if (strlen(filename) + 5 >= sizeof(img->tmp[i])) { + av_log(s, AV_LOG_ERROR, "Filename too long: %s\n", filename); + ret = AVERROR(EINVAL); + goto fail; + } snprintf(img->tmp[i], sizeof(img->tmp[i]), "%s.tmp", filename); av_strlcpy(img->target[i], filename, sizeof(img->target[i])); if (s->io_open(s, &pb[i], img->use_rename ? img->tmp[i] : filename, AVIO_FLAG_WRITE, &options) < 0) { -- 2.34.1

3 2

forgejo labels
by Michael Niedermayer 30 Jul '25

30 Jul '25

Hi regression: issue aaddresses a regression bug: something is not working This is inconsistent Label X cannot sometimes mean "X is removed" and "X is added" bug seems meaning that the PR adds a bug regression seems meaning that the PR removes a regression IMO this should be done consistently a PR can have bugs and it can fix bugs a PR can cause regressions and it can fix regressions thx -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB "I am not trying to be anyone's saviour, I'm trying to think about the future and not be sad" - Elon Musk

6 8

[PATCH] avfilter/drawtext: replace strcpy/strcat with av_strlcpy/av_strlcat
by Sanjay Jangid 30 Jul '25

30 Jul '25

Signed-off-by: Sanjay Jangid <sanjayjangid20m(a)gmail.com> --- libavfilter/vf_drawtext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index aae703b..5cd8633 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -1880,7 +1880,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) av_strlcpy(s->text, bbox->detect_label, sizeof(s->text)); for (int j = 0; j < bbox->classify_count; j++) { av_strlcat(s->text, ", ", sizeof(s->text)); - av_strlcat(s->text, bbox->classify_labels[j], sizeof(s->text)); + av_strlcat(s->text, bbox->classify_labels[j], sizeof(s->text)); } s->x = bbox->x; s->y = bbox->y - s->fontsize; -- 2.50.1

2 1

[PATCH] avfilter/drawtext: replace strcpy/strcat with av_strlcpy/av_strlcat
by Sanjay Jangid 30 Jul '25

30 Jul '25

Signed-off-by: Sanjay Jangid <sanjayjangid20m(a)gmail.com> --- libavfilter/vf_drawtext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index aae703b..5cd8633 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -1880,7 +1880,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) av_strlcpy(s->text, bbox->detect_label, sizeof(s->text)); for (int j = 0; j < bbox->classify_count; j++) { av_strlcat(s->text, ", ", sizeof(s->text)); - av_strlcat(s->text, bbox->classify_labels[j], sizeof(s->text)); + av_strlcat(s->text, bbox->classify_labels[j], sizeof(s->text)); } s->x = bbox->x; s->y = bbox->y - s->fontsize; -- 2.50.1

1 0

[PATCH 1/5] avformat/mov: Check that sample_count is allocated in mov_parse_heif_items()
by Michael Niedermayer 29 Jul '25

29 Jul '25

Fixes: NULL pointer dereference Fixes: 416811958/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5425269114732544 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 8a094b1ea0a..6e9e3498fb5 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -10336,7 +10336,7 @@ static int mov_parse_heif_items(AVFormatContext *s) st->codecpar->height = item->height; err = sanity_checks(s, sc, item->item_id); - if (err) + if (err || !sc->sample_count) return AVERROR_INVALIDDATA; sc->sample_sizes[0] = item->extent_length; -- 2.49.0

3 11

[PATCH] lavc/vvc: Mark SPS used if multiple CLVSSs use it
by Frank Plowman 29 Jul '25

29 Jul '25

Consider the following sequence of NALUs (with some PPSs etc. omitted for brevity): 1. SPS (ID=0, content=A) 2. IDR (SPS=0) 3. IDR (SPS=0) 4. SPS (ID=0, content=B) 5. TRAIL (SPS=0) When decode_sps is called for NALU 3., ps->sps_id_used is cleared as IDRs are one way of forming a CLVSS. Then, old_sps is non-NULL containing the result of calling decode_sps for NALU 2. We haven't received any SPSs between NALUs 2. and 3., therefore old_sps and rsps are identical and the function returns. The issue is that, at this point, ps->sps_id_used is still zero despite the SPS being used for IDR 3. This results in the check for conflicting SPSs not working properly when decode_sps is called for NALU 5., allowing prediction between pictures with different SPSs and probably all sorts of other shenanigans. Patch addresses the problem outlined above by also setting ps->sps_id_used in the early return case. Signed-off-by: Frank Plowman <post(a)frankplowman.com> --- Patch is also available at https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20061 --- libavcodec/vvc/ps.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/vvc/ps.c b/libavcodec/vvc/ps.c index d9f46b219a..6eec0fe586 100644 --- a/libavcodec/vvc/ps.c +++ b/libavcodec/vvc/ps.c @@ -288,9 +288,10 @@ static int decode_sps(VVCParamSets *ps, AVCodecContext *c, const H266RawSPS *rsp } if (old_sps) { - if (old_sps->r == rsps || !memcmp(old_sps->r, rsps, sizeof(*old_sps->r))) + if (old_sps->r == rsps || !memcmp(old_sps->r, rsps, sizeof(*old_sps->r))) { + ps->sps_id_used |= (1 << sps_id); return 0; - else if (ps->sps_id_used & (1 << sps_id)) + } else if (ps->sps_id_used & (1 << sps_id)) return AVERROR_INVALIDDATA; } -- 2.47.0

1 0

[PATCH 1/4] avfilter/trim: consume all available frames and avoid activate reschedule
by Marton Balint 29 Jul '25

29 Jul '25

There is no benefit in delaying processing all available frames. Signed-off-by: Marton Balint <cus(a)passwd.hu> --- libavfilter/trim.c | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/libavfilter/trim.c b/libavfilter/trim.c index 7200680716..6d1016ac81 100644 --- a/libavfilter/trim.c +++ b/libavfilter/trim.c @@ -90,10 +90,8 @@ static int trim_filter_frame(AVFilterLink *inlink, AVFrame *frame) int drop; /* drop everything if EOF has already been returned */ - if (s->eof) { - av_frame_free(&frame); + if (s->eof) return 0; - } if (s->start_frame >= 0 || s->start_pts != AV_NOPTS_VALUE) { drop = 1; @@ -131,13 +129,10 @@ static int trim_filter_frame(AVFilterLink *inlink, AVFrame *frame) s->nb_frames++; - return ff_filter_frame(ctx->outputs[0], frame); + return 1; drop: - if (!s->eof) - ff_filter_set_ready(ctx, 100); s->nb_frames++; - av_frame_free(&frame); return 0; } #endif // CONFIG_TRIM_FILTER @@ -152,10 +147,8 @@ static int atrim_filter_frame(AVFilterLink *inlink, AVFrame *frame) int drop; /* drop everything if EOF has already been returned */ - if (s->eof) { - av_frame_free(&frame); + if (s->eof) return 0; - } if (frame->pts != AV_NOPTS_VALUE) pts = av_rescale_q(frame->pts, inlink->time_base, @@ -230,10 +223,8 @@ static int atrim_filter_frame(AVFilterLink *inlink, AVFrame *frame) if (start_sample) { AVFrame *out = ff_get_audio_buffer(ctx->outputs[0], end_sample - start_sample); - if (!out) { - av_frame_free(&frame); + if (!out) return AVERROR(ENOMEM); - } av_frame_copy_props(out, frame); av_samples_copy(out->extended_data, frame->extended_data, 0, start_sample, @@ -243,18 +234,16 @@ static int atrim_filter_frame(AVFilterLink *inlink, AVFrame *frame) out->pts += av_rescale_q(start_sample, (AVRational){ 1, out->sample_rate }, inlink->time_base); - av_frame_free(&frame); - frame = out; + av_frame_unref(frame); + av_frame_move_ref(frame, out); + av_frame_free(&out); } else frame->nb_samples = end_sample; - return ff_filter_frame(ctx->outputs[0], frame); + return 1; drop: - if (!s->eof) - ff_filter_set_ready(ctx, 100); s->nb_samples += frame->nb_samples; - av_frame_free(&frame); return 0; } #endif // CONFIG_ATRIM_FILTER @@ -295,18 +284,21 @@ static int activate(AVFilterContext *ctx) TrimContext *s = ctx->priv; AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *outlink = ctx->outputs[0]; + AVFrame *frame = NULL; + int ret; FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); - if (!s->eof && ff_inlink_queued_frames(inlink)) { - AVFrame *frame = NULL; - int ret; - - ret = ff_inlink_consume_frame(inlink, &frame); + while ((ret = ff_inlink_consume_frame(inlink, &frame))) { if (ret < 0) return ret; + + ret = s->filter_frame(inlink, frame); if (ret > 0) - return s->filter_frame(inlink, frame); + return ff_filter_frame(outlink, frame); + av_frame_free(&frame); + if (ret < 0) + return ret; } FF_FILTER_FORWARD_STATUS(inlink, outlink); -- 2.43.0

1 4

forgejo PR vs git send email questions
by Michael Niedermayer 29 Jul '25

29 Jul '25

Hi with git send email i can send 5 independant patches with git send-email --to='FFmpeg development discussions and patches <ffmpeg-devel(a)ffmpeg.org>' -5 and have some CC: tags to make sure people (like bug reporter or security researcher) get notified Does our forgejo act on CC: ? Also with 5 independant patches, 1 pr or 5 prs ? thx -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I have never wished to cater to the crowd; for what I know they do not approve, and what they approve I do not know. -- Epicurus

4 4

[PATCH 1/1] libavformat/img2enc.c: rm warning ‘.tmp’ directive output may be truncated
by Cai Fan 29 Jul '25

29 Jul '25

Signed-off-by: Cai Fan <caifan0425(a)163.com> --- libavformat/img2enc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 672cfe18fd..f7d983ec54 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -182,7 +182,8 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) av_dict_copy(&options, img->protocol_opts, 0); if (strlen(filename) + 5 >= sizeof(img->tmp[i])) { av_log(s, AV_LOG_ERROR, "Filename too long: %s\n", filename); - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + goto fail; } snprintf(img->tmp[i], sizeof(img->tmp[i]), "%s.tmp", filename); av_strlcpy(img->target[i], filename, sizeof(img->target[i])); -- 2.34.1

2 1