October 2025 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] avcodec/mediacodecdec_common: Check that the input to mediacodec_wrap_sw_audio_buffer() contains channel * sample_size (PR #20810)
by michaelni 31 Oct '25

31 Oct '25

PR #20810 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20810 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20810.patch Fixes: out of array access no testcase Found-by: Joshua Rogers <joshua(a)joshua.hu> with ZeroPath Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> From ac541f9e21806a4a0a0db1815582da7dfb944625 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Fri, 31 Oct 2025 23:31:40 +0100 Subject: [PATCH] avcodec/mediacodecdec_common: Check that the input to mediacodec_wrap_sw_audio_buffer() contains channel * sample_size Fixes: out of array access no testcase Found-by: Joshua Rogers <joshua(a)joshua.hu> with ZeroPath Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/mediacodecdec_common.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/mediacodecdec_common.c b/libavcodec/mediacodecdec_common.c index ae336ab835..9b91c8edf5 100644 --- a/libavcodec/mediacodecdec_common.c +++ b/libavcodec/mediacodecdec_common.c @@ -385,6 +385,12 @@ static int mediacodec_wrap_sw_audio_buffer(AVCodecContext *avctx, goto done; } + if (info->size % (sample_size * avctx->ch_layout.nb_channels)) { + av_log(avctx, AV_LOG_ERROR, "input is not a multiple of channels * sample_size\n"); + ret = AVERROR(EINVAL); + goto done; + } + frame->format = avctx->sample_fmt; frame->sample_rate = avctx->sample_rate; frame->nb_samples = info->size / (sample_size * avctx->ch_layout.nb_channels); -- 2.49.1

1 0

[PATCH] avformat/sctp: Check size in sctp_write() (PR #20809)
by michaelni 31 Oct '25

31 Oct '25

PR #20809 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20809 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20809.patch Fixes: out of array access No testcase Found-by: Joshua Rogers <joshua(a)joshua.hu> with ZeroPath Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> From e124c1f611e45eda94192afbdb6d0d36747892e9 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Fri, 31 Oct 2025 23:08:45 +0100 Subject: [PATCH] avformat/sctp: Check size in sctp_write() Fixes: out of array access No testcase Found-by: Joshua Rogers <joshua(a)joshua.hu> with ZeroPath Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavformat/sctp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/sctp.c b/libavformat/sctp.c index 4122fbe312..9a6b991803 100644 --- a/libavformat/sctp.c +++ b/libavformat/sctp.c @@ -332,6 +332,9 @@ static int sctp_write(URLContext *h, const uint8_t *buf, int size) } if (s->max_streams) { + if (size < 2) + return AVERROR(EINVAL); + /*StreamId is introduced as a 2byte code into the stream*/ struct sctp_sndrcvinfo info = { 0 }; info.sinfo_stream = AV_RB16(buf); -- 2.49.1

1 0

[PATCH] Fix new Coverity issues (PR #20807)
by James Almer 31 Oct '25

31 Oct '25

PR #20807 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20807 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20807.patch From fc67642ae6ad13b9bebff3f354cc249be70c917a Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Fri, 31 Oct 2025 15:54:27 -0300 Subject: [PATCH 1/4] fftools/ffmpeg: make fg_create{_simple,} clear the input string pointer The graph string is either freed or attached to the filtergraph, so it's best to not leave a dangling pointer with the caller. Signed-off-by: James Almer <jamrial(a)gmail.com> --- fftools/ffmpeg.h | 6 +++--- fftools/ffmpeg_demux.c | 2 +- fftools/ffmpeg_filter.c | 14 ++++++++------ fftools/ffmpeg_mux_init.c | 2 +- fftools/ffmpeg_opt.c | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index c866980251..cc2ea1a56e 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -811,7 +811,7 @@ int parse_and_set_vsync(const char *arg, enum VideoSyncMethod *vsync_var, int fi int filtergraph_is_simple(const FilterGraph *fg); int fg_create_simple(FilterGraph **pfg, InputStream *ist, - char *graph_desc, + char **graph_desc, Scheduler *sch, unsigned sched_idx_enc, const OutputFilterOptions *opts); int fg_finalise_bindings(void); @@ -834,10 +834,10 @@ int ofilter_bind_enc(OutputFilter *ofilter, /** * Create a new filtergraph in the global filtergraph list. * - * @param graph_desc Graph description; an av_malloc()ed string, filtergraph + * @param graph_desc Pointer to graph description; an av_malloc()ed string, filtergraph * takes ownership of it. */ -int fg_create(FilterGraph **pfg, char *graph_desc, Scheduler *sch, +int fg_create(FilterGraph **pfg, char **graph_desc, Scheduler *sch, const OutputFilterOptions *opts); void fg_free(FilterGraph **pfg); diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 6901f59dd0..29ef86b7c9 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1705,7 +1705,7 @@ static int istg_parse_tile_grid(const OptionsContext *o, Demuxer *d, InputStream return ret; } - ret = fg_create(NULL, graph_str, d->sch, &opts); + ret = fg_create(NULL, &graph_str, d->sch, &opts); if (ret < 0) return ret; diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index b0244fa774..9f962e6b8c 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1085,7 +1085,7 @@ static const AVClass fg_class = { .category = AV_CLASS_CATEGORY_FILTER, }; -int fg_create(FilterGraph **pfg, char *graph_desc, Scheduler *sch, +int fg_create(FilterGraph **pfg, char **graph_desc, Scheduler *sch, const OutputFilterOptions *opts) { FilterGraphPriv *fgp; @@ -1097,7 +1097,7 @@ int fg_create(FilterGraph **pfg, char *graph_desc, Scheduler *sch, fgp = av_mallocz(sizeof(*fgp)); if (!fgp) { - av_freep(&graph_desc); + av_freep(graph_desc); return AVERROR(ENOMEM); } fg = &fgp->fg; @@ -1108,7 +1108,7 @@ int fg_create(FilterGraph **pfg, char *graph_desc, Scheduler *sch, } else { ret = av_dynarray_add_nofree(&filtergraphs, &nb_filtergraphs, fgp); if (ret < 0) { - av_freep(&graph_desc); + av_freep(graph_desc); av_freep(&fgp); return ret; } @@ -1117,11 +1117,13 @@ int fg_create(FilterGraph **pfg, char *graph_desc, Scheduler *sch, } fg->class = &fg_class; - fg->graph_desc = graph_desc; + fg->graph_desc = *graph_desc; fgp->disable_conversions = !auto_conversion_filters; fgp->nb_threads = -1; fgp->sch = sch; + *graph_desc = NULL; + snprintf(fgp->log_name, sizeof(fgp->log_name), "fc#%d", fg->index); fgp->frame = av_frame_alloc(); @@ -1245,7 +1247,7 @@ fail: int fg_create_simple(FilterGraph **pfg, InputStream *ist, - char *graph_desc, + char **graph_desc, Scheduler *sch, unsigned sched_idx_enc, const OutputFilterOptions *opts) { @@ -1270,7 +1272,7 @@ int fg_create_simple(FilterGraph **pfg, "to have exactly 1 input and 1 output. " "However, it had %d input(s) and %d output(s). Please adjust, " "or use a complex filtergraph (-filter_complex) instead.\n", - graph_desc, fg->nb_inputs, fg->nb_outputs); + *graph_desc, fg->nb_inputs, fg->nb_outputs); return AVERROR(EINVAL); } if (fg->outputs[0]->type != type) { diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index be1dbad479..bcbbee9126 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1003,7 +1003,7 @@ ost_bind_filter(const Muxer *mux, MuxStream *ms, OutputFilter *ofilter, ost->filter = ofilter; ret = ofilter_bind_enc(ofilter, ms->sch_idx_enc, &opts); } else { - ret = fg_create_simple(&ost->fg_simple, ost->ist, filters, + ret = fg_create_simple(&ost->fg_simple, ost->ist, &filters, mux->sch, ms->sch_idx_enc, &opts); if (ret >= 0) ost->filter = ost->fg_simple->outputs[0]; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index f51523d2e0..80bb9236af 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1496,7 +1496,7 @@ int ffmpeg_parse_options(int argc, char **argv, Scheduler *sch) /* create complex filtergraphs */ for (int i = 0; i < go.nb_filtergraphs; i++) { - ret = fg_create(NULL, go.filtergraphs[i], sch, NULL); + ret = fg_create(NULL, &go.filtergraphs[i], sch, NULL); go.filtergraphs[i] = NULL; if (ret < 0) goto fail; -- 2.49.1 From 2037e2b15b84fc2b31c841f115eacaa0d0f09d6b Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Fri, 31 Oct 2025 15:56:40 -0300 Subject: [PATCH 2/4] fftools/ffmpeg_demux: fix potential memory leak when creating tile grid filtergraphs Fixes CID 1668266. Signed-off-by: James Almer <jamrial(a)gmail.com> --- fftools/ffmpeg_demux.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 29ef86b7c9..cb79dd7611 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1702,17 +1702,22 @@ static int istg_parse_tile_grid(const OptionsContext *o, Demuxer *d, InputStream ret = av_packet_side_data_to_frame(&opts.side_data, &opts.nb_side_data, sd, 0); if (ret < 0 && ret != AVERROR(EINVAL)) - return ret; + goto fail; } ret = fg_create(NULL, &graph_str, d->sch, &opts); if (ret < 0) - return ret; + goto fail; istg->fg = filtergraphs[nb_filtergraphs-1]; istg->fg->is_internal = 1; - return 0; + ret = 0; +fail: + if (ret < 0) + av_freep(&graph_str); + + return ret; } static int istg_add(const OptionsContext *o, Demuxer *d, AVStreamGroup *stg) -- 2.49.1 From 402599354e29b17b7d6e49666180bbe603a9d871 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Fri, 31 Oct 2025 15:59:18 -0300 Subject: [PATCH 3/4] fftools/ffmpeg_filter: check the side data descriptor pointer is not NULL Fixes CID 1668264. Signed-off-by: James Almer <jamrial(a)gmail.com> --- fftools/ffmpeg_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 9f962e6b8c..a770804862 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -2266,7 +2266,7 @@ static int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *fr for (int i = 0; i < frame->nb_side_data; i++) { const AVSideDataDescriptor *desc = av_frame_side_data_desc(frame->side_data[i]->type); - if (!(desc->props & AV_SIDE_DATA_PROP_GLOBAL) || + if (!desc || !(desc->props & AV_SIDE_DATA_PROP_GLOBAL) || frame->side_data[i]->type == AV_FRAME_DATA_DISPLAYMATRIX) continue; -- 2.49.1 From 858b53bb82afe70863ed33d7cfbc73822b49ff69 Mon Sep 17 00:00:00 2001 From: James Almer <jamrial(a)gmail.com> Date: Fri, 31 Oct 2025 16:05:02 -0300 Subject: [PATCH 4/4] avutil/csp: check the for NULL pointer in av_csp_primaries_desc_from_id Fixes CID 1668265. Signed-off-by: James Almer <jamrial(a)gmail.com> --- libavutil/csp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/csp.c b/libavutil/csp.c index c8ecddc110..2ab4fee9dd 100644 --- a/libavutil/csp.c +++ b/libavutil/csp.c @@ -100,7 +100,7 @@ const AVColorPrimariesDesc *av_csp_primaries_desc_from_id(enum AVColorPrimaries else if (((unsigned)prm >= AVCOL_PRI_EXT_BASE) && ((unsigned)prm < AVCOL_PRI_EXT_NB)) p = &color_primaries_ext[prm - AVCOL_PRI_EXT_BASE]; - if (!p->prim.r.x.num) + if (p && !p->prim.r.x.num) return NULL; return p; } -- 2.49.1

1 0

[PATCH] avcodec/qtrle: set keyframe flag in output frames (PR #20806)
by jermy 31 Oct '25

31 Oct '25

PR #20806 opened by jermy URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20806 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20806.patch This was broken by dc7bd7c5a5 because it was depending on the behaviour of all frames setting key_frame by default, although that was also wrong because it didn't unset the flag for duplicate/repeated frames. (this is the same change as a PR that was posted to ffmpeg-devel yesterday) Signed-off-by: Jeremy James <jeremy.james(a)gmail.com> From e8b0dcfd76ea476f2feb40cc86a2a30be2dad8bc Mon Sep 17 00:00:00 2001 From: Jeremy James <jeremy.james(a)gmail.com> Date: Thu, 30 Oct 2025 13:53:28 +0000 Subject: [PATCH] avcodec/qtrle: set keyframe flag in output frames This was broken by dc7bd7c5a5 because it was depending on the behaviour of all frames setting key_frame by default, although that was also wrong because it didn't unset the flag for duplicate/repeated frames. Signed-off-by: Jeremy James <jeremy.james(a)gmail.com> --- libavcodec/qtrle.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 1c2fbc357e..c8bee8ce44 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -557,6 +557,10 @@ done: if ((ret = av_frame_ref(rframe, s->frame)) < 0) return ret; + + rframe->pict_type = !duplicate ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; + rframe->flags = AV_FRAME_FLAG_KEY * !duplicate; + *got_frame = 1; /* always report that the buffer was completely consumed */ -- 2.49.1

1 0

[PATCH] avformat/http: Fix off by 1 error (PR #20804)
by michaelni 31 Oct '25

31 Oct '25

PR #20804 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20804 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20804.patch Fixes: out of array access Fixes: zeropath/off-by-one-one-byte Found-by: Joshua Rogers <joshua(a)joshua.hu> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> From 6f8c0708d86ff376ee1bfc2be811579e58a44491 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Fri, 31 Oct 2025 17:32:56 +0100 Subject: [PATCH] avformat/http: Fix off by 1 error Fixes: out of array access Fixes: zeropath/off-by-one-one-byte Found-by: Joshua Rogers <joshua(a)joshua.hu> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavformat/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/http.c b/libavformat/http.c index 49d750b512..c4e6292a95 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1875,7 +1875,7 @@ static int store_icy(URLContext *h, int size) ret = http_read_stream_all(h, data, len); if (ret < 0) return ret; - data[len + 1] = 0; + data[len] = 0; if ((ret = av_opt_set(s, "icy_metadata_packet", data, 0)) < 0) return ret; update_metadata(h, data); -- 2.49.1

1 0

[PATCH] avformat/rtpdec_rfc4175: several bug fixes (PR #20803)
by michaelni 31 Oct '25

31 Oct '25

PR #20803 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20803 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20803.patch From ec17f9d7a3ec23b1efafd53978a8d5b2866d2f40 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Fri, 31 Oct 2025 16:17:27 +0100 Subject: [PATCH 1/3] avformat/rtpdec_rfc4175: Fix memleak of sampling Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavformat/rtpdec_rfc4175.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index d6260ab69e..c41e4f19e0 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -128,7 +128,7 @@ static int rfc4175_parse_fmtp(AVFormatContext *s, AVStream *stream, data->width = atoi(value); else if (!strncmp(attr, "height", 6)) data->height = atoi(value); - else if (!strncmp(attr, "sampling", 8)) + else if (data->sampling == NULL && !strncmp(attr, "sampling", 8)) data->sampling = av_strdup(value); else if (!strncmp(attr, "depth", 5)) data->depth = atoi(value); -- 2.49.1 From 90b4c0094eb52dbac388803482e0704121a752ca Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Fri, 31 Oct 2025 16:27:56 +0100 Subject: [PATCH 2/3] avformat/rtpdec_rfc4175: Only change PayloadContext on success Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavformat/rtpdec_rfc4175.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index c41e4f19e0..d793f56949 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -23,6 +23,7 @@ #include "avio_internal.h" #include "rtpdec_formats.h" +#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/mem.h" #include "libavutil/pixdesc.h" @@ -172,30 +173,36 @@ static int rfc4175_parse_fmtp(AVFormatContext *s, AVStream *stream, } static int rfc4175_parse_sdp_line(AVFormatContext *s, int st_index, - PayloadContext *data, const char *line) + PayloadContext *data_arg, const char *line) { const char *p; if (st_index < 0) return 0; + av_assert0(!data_arg->sampling); + if (av_strstart(line, "fmtp:", &p)) { AVStream *stream = s->streams[st_index]; + PayloadContext data0 = *data_arg, *data = &data0; int ret = ff_parse_fmtp(s, stream, data, p, rfc4175_parse_fmtp); - if (ret < 0) - return ret; - - if (!data->sampling || !data->depth || !data->width || !data->height) - return AVERROR(EINVAL); + ret = AVERROR(EINVAL); + + if (ret < 0) + goto fail; + stream->codecpar->width = data->width; stream->codecpar->height = data->height; ret = rfc4175_parse_format(stream, data); av_freep(&data->sampling); - + if (ret >= 0) + *data_arg = *data; +fail: + av_freep(&data->sampling); return ret; } -- 2.49.1 From 26ddbac6eccdfdf5cf8b1088a4c28292ba9d49e0 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer <michael(a)niedermayer.cc> Date: Fri, 31 Oct 2025 16:28:49 +0100 Subject: [PATCH 3/3] avformat/rtpdec_rfc4175: Check dimensions Fixes: out of array access Fixes: zeropath/int_overflow_in_rtpdec_rfc4175 Found-by: Joshua Rogers <joshua(a)joshua.hu> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavformat/rtpdec_rfc4175.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/rtpdec_rfc4175.c b/libavformat/rtpdec_rfc4175.c index d793f56949..b49fc55d2d 100644 --- a/libavformat/rtpdec_rfc4175.c +++ b/libavformat/rtpdec_rfc4175.c @@ -25,6 +25,7 @@ #include "rtpdec_formats.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/imgutils.h" #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavutil/parseutils.h" @@ -193,6 +194,9 @@ static int rfc4175_parse_sdp_line(AVFormatContext *s, int st_index, if (ret < 0) goto fail; + ret = av_image_check_size(data->width, data->height, 0, s); + if (ret < 0) + goto fail; stream->codecpar->width = data->width; stream->codecpar->height = data->height; @@ -303,6 +307,9 @@ static int rfc4175_handle_packet(AVFormatContext *ctx, PayloadContext *data, if (data->interlaced) line = 2 * line + field; + if (line >= data->height) + return AVERROR_INVALIDDATA; + /* prevent ill-formed packets to write after buffer's end */ copy_offset = (line * data->width + offset) * data->pgroup / data->xinc; if (copy_offset + length > data->frame_size || !data->frame) -- 2.49.1

1 0

[PATCH] libavformat/mov: add support for name udta (PR #20802)
by Lukas 31 Oct '25

31 Oct '25

PR #20802 opened by Lukas (lholliger) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20802 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20802.patch In the QTFF documentation for udta/"user data atoms", "name" is a valid entry for "name of object" however it is currently skipped leading to some missing metadata when copying for some files. This isn't classified the same as "(C)nam" which is "Title of content" so they aren't necessarily the same. Docs: https://developer.apple.com/documentation/quicktime-file-format/user_data_a… Fixes #20750 From 881de845afce926482159b8d2272a6fa33fdeadd Mon Sep 17 00:00:00 2001 From: lholliger <14064434+lholliger(a)users.noreply.github.com> Date: Fri, 31 Oct 2025 10:21:38 -0400 Subject: [PATCH] libavformat/mov: add support for name udta In the QTFF documentation for udta/"user data atoms", "name" is a valid entry for "name of object" however it is currently skipped leading to some missing metadata when copying for some files. This isn't classified the same as "(C)nam" which is "Title of content" so they aren't necessarily the same. --- libavformat/mov.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 45c562cdc6..42062e6ba6 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -392,6 +392,7 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom) return mov_metadata_loci(c, pb, atom.size); case MKTAG( 'm','a','n','u'): key = "make"; break; case MKTAG( 'm','o','d','l'): key = "model"; break; + case MKTAG( 'n','a','m','e'): key = "name"; break; case MKTAG( 'p','c','s','t'): key = "podcast"; parse = mov_metadata_int8_no_padding; break; case MKTAG( 'p','g','a','p'): key = "gapless_playback"; -- 2.49.1

1 0

[PATCH] avformat/libopenmpt: implement file reading callbacks (PR #20801)
by paper 31 Oct '25

31 Oct '25

PR #20801 opened by paper URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20801 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20801.patch Before, this code would unnecessarily waste quite a bit of memory reading the entire file in, and in many cases just freeing the result and throwing it out anyway. This commit changes the behavior to use libopenmpt's callback structure. This is much more memory efficient, especially for particularly large files. Both pre-0.3.0 and post-0.3.0 preprocessor branches have been tested working with a plain amiga-style 'M.K.' module in ffplay. Signed-off-by: Paper <paper(a)tflc.us> From 81787bbaa31733ad7c5dd2ea727bc7bd06104719 Mon Sep 17 00:00:00 2001 From: Paper <paper(a)tflc.us> Date: Tue, 2 Sep 2025 10:34:14 -0400 Subject: [PATCH] avformat/libopenmpt: implement file reading callbacks Before, this code would unnecessarily waste quite a bit of memory reading the entire file in, and in many cases just freeing the result and throwing it out anyway. This commit changes the behavior to use libopenmpt's callback structure. This is much more memory efficient, especially for particularly large files. Both pre-0.3.0 and post-0.3.0 preprocessor branches have been tested working with a plain amiga-style 'M.K.' module in ffplay. Signed-off-by: Paper <paper(a)tflc.us> --- libavformat/libopenmpt.c | 66 ++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 19 deletions(-) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 46af4bff22..52f4ab2b7d 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -69,6 +69,51 @@ static void openmpt_logfunc(const char *message, void *userdata) av_log(userdata, level, "%s\n", message); } +static size_t av_openmpt_read(void *stream, void *dst, size_t bytes) +{ + AVIOContext *ioctx = stream; + int r; + + /* avio_read takes an int, cap the size accordingly */ + if (bytes > (size_t)INT_MAX) + bytes = (size_t)INT_MAX; + + r = avio_read(ioctx, dst, bytes); + + return (r >= 0) ? r : 0; +} + +static int av_openmpt_seek(void *stream, int64_t offset, int whence) +{ + AVIOContext *ioctx = stream; + int whence_av; + + switch (whence) { + case OPENMPT_STREAM_SEEK_SET: whence_av = SEEK_SET; break; + case OPENMPT_STREAM_SEEK_CUR: whence_av = SEEK_CUR; break; + case OPENMPT_STREAM_SEEK_END: whence_av = SEEK_END; break; + /* invalid value, punt */ + default: return -1; + } + + /* openmpt expects stdio-style seek; don't return new position */ + return (avio_seek(ioctx, offset, whence_av) < 0) ? -1 : 0; +} + +static int64_t av_openmpt_tell(void *stream) +{ + AVIOContext *ioctx = stream; + int64_t r = avio_tell(ioctx); + + return (r < 0) ? -1 : r; +} + +static const openmpt_stream_callbacks openmpt_cbs = { + av_openmpt_read, + av_openmpt_seek, + av_openmpt_tell +}; + #define add_meta(s, name, meta) \ do { \ const char *value = meta; \ @@ -81,30 +126,14 @@ static int read_header_openmpt(AVFormatContext *s) { AVStream *st; OpenMPTContext *openmpt = s->priv_data; - int64_t size; - char *buf; #if OPENMPT_API_VERSION_AT_LEAST(0,3,0) int error; #endif int ret; - size = avio_size(s->pb); - if (size <= 0) - return AVERROR_INVALIDDATA; - buf = av_malloc(size); - if (!buf) - return AVERROR(ENOMEM); - size = avio_read(s->pb, buf, size); - if (size < 0) { - av_log(s, AV_LOG_ERROR, "Reading input buffer failed.\n"); - av_freep(&buf); - return size; - } - #if OPENMPT_API_VERSION_AT_LEAST(0,3,0) error = OPENMPT_ERROR_OK; - openmpt->module = openmpt_module_create_from_memory2(buf, size, openmpt_logfunc, s, NULL, NULL, &error, NULL, NULL); - av_freep(&buf); + openmpt->module = openmpt_module_create2(openmpt_cbs, s->pb, openmpt_logfunc, s, NULL, NULL, &error, NULL, NULL); if (!openmpt->module) { if (error == OPENMPT_ERROR_OUT_OF_MEMORY) return AVERROR(ENOMEM); @@ -114,8 +143,7 @@ static int read_header_openmpt(AVFormatContext *s) return AVERROR_UNKNOWN; } #else - openmpt->module = openmpt_module_create_from_memory(buf, size, openmpt_logfunc, s, NULL); - av_freep(&buf); + openmpt->module = openmpt_module_create(openmpt_cbs, s->pb, openmpt_logfunc, s, NULL); if (!openmpt->module) return AVERROR_INVALIDDATA; #endif -- 2.49.1

1 0

[PATCH] avformat/libopenmpt: add configurable interpolation options (PR #20800)
by paper 31 Oct '25

31 Oct '25

PR #20800 opened by paper URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20800 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20800.patch From 711fcb5f8a287727184664313451240686de178a Mon Sep 17 00:00:00 2001 From: Paper <paper(a)tflc.us> Date: Tue, 2 Sep 2025 10:47:06 -0400 Subject: [PATCH 1/2] avformat/libopenmpt: add configurable interpolation options This commit adds an interpolation setting to the AVOptions structure, allowing the user to choose which method they would like to use. For modules, this is fairly important. Most modules use lo-fi samples (read: 8khz 8-bit possibly adpcm) which can sound terrible when mixing using high quality interpolation algorithms. This becomes especially prevalent in chiptune compositions, where hi-fi interpolation completely changes the sound. Virtually any value is accepted by libopenmpt, but only [1,2,4,8] produce any tangible difference in output. All other values seemingly get routed to the default, which is equivalent to passing 8 (8-tap windowed sinc). Signed-off-by: Paper <paper(a)tflc.us> --- libavformat/libopenmpt.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 46af4bff22..1721e59372 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -46,6 +46,7 @@ typedef struct OpenMPTContext { int sample_rate; AVChannelLayout ch_layout; int subsong; + int interp; } OpenMPTContext; #define OFFSET(x) offsetof(OpenMPTContext, x) @@ -57,6 +58,12 @@ static const AVOption options[] = { { "subsong", "set subsong", OFFSET(subsong), AV_OPT_TYPE_INT, { .i64 = -2 }, -2, INT_MAX, A | D, .unit = "subsong"}, { "all", "all", 0, AV_OPT_TYPE_CONST, { .i64 = -1}, 0, 0, A | D, .unit = "subsong" }, { "auto", "auto", 0, AV_OPT_TYPE_CONST, { .i64 = -2}, 0, 0, A | D, .unit = "subsong" }, + { "interpolation", "set interpolation method", OFFSET(interp), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, A | D, .unit = "interpolation"}, + { "default", "default", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, A | D, .unit = "interpolation"}, + { "none", "none", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, A | D, .unit = "interpolation"}, + { "linear", "linear", 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, 0, 0, A | D, .unit = "interpolation"}, + { "cubic", "cubic", 0, AV_OPT_TYPE_CONST, { .i64 = 4 }, 0, 0, A | D, .unit = "interpolation"}, + { "8-tap-sinc", "8-tap windowed sinc", 0, AV_OPT_TYPE_CONST, { .i64 = 8 }, 0, 0, A | D, .unit = "interpolation"}, { NULL } }; @@ -120,6 +127,14 @@ static int read_header_openmpt(AVFormatContext *s) return AVERROR_INVALIDDATA; #endif + ret = openmpt_module_set_render_param(openmpt->module, + OPENMPT_MODULE_RENDER_INTERPOLATIONFILTER_LENGTH, + openmpt->interp); + if (!ret) { + av_log(s, AV_LOG_ERROR, "Invalid interpolation setting: %d\n", openmpt->interp); + return AVERROR(EINVAL); + } + if (openmpt->subsong >= openmpt_module_get_num_subsongs(openmpt->module)) { av_log(s, AV_LOG_ERROR, "Invalid subsong index: %d\n", openmpt->subsong); return AVERROR(EINVAL); -- 2.49.1 From a6de836961f6813fa58f452161f876f52aa31cc5 Mon Sep 17 00:00:00 2001 From: Paper <paper(a)tflc.us> Date: Tue, 2 Sep 2025 12:37:43 -0400 Subject: [PATCH 2/2] avformat/libopenmpt: align AVOptions and remove unnecessary whitespace This is a purely cosmetic change. Signed-off-by: Paper <paper(a)tflc.us> --- libavformat/libopenmpt.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index 1721e59372..d7c9d4a7d6 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -53,17 +53,17 @@ typedef struct OpenMPTContext { #define A AV_OPT_FLAG_AUDIO_PARAM #define D AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { - { "sample_rate", "set sample rate", OFFSET(sample_rate), AV_OPT_TYPE_INT, { .i64 = 48000 }, 1000, INT_MAX, A | D }, - { "layout", "set channel layout", OFFSET(ch_layout), AV_OPT_TYPE_CHLAYOUT, { .str = "stereo" }, 0, 0, A | D }, - { "subsong", "set subsong", OFFSET(subsong), AV_OPT_TYPE_INT, { .i64 = -2 }, -2, INT_MAX, A | D, .unit = "subsong"}, - { "all", "all", 0, AV_OPT_TYPE_CONST, { .i64 = -1}, 0, 0, A | D, .unit = "subsong" }, - { "auto", "auto", 0, AV_OPT_TYPE_CONST, { .i64 = -2}, 0, 0, A | D, .unit = "subsong" }, - { "interpolation", "set interpolation method", OFFSET(interp), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, A | D, .unit = "interpolation"}, - { "default", "default", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, A | D, .unit = "interpolation"}, - { "none", "none", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, A | D, .unit = "interpolation"}, - { "linear", "linear", 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, 0, 0, A | D, .unit = "interpolation"}, - { "cubic", "cubic", 0, AV_OPT_TYPE_CONST, { .i64 = 4 }, 0, 0, A | D, .unit = "interpolation"}, - { "8-tap-sinc", "8-tap windowed sinc", 0, AV_OPT_TYPE_CONST, { .i64 = 8 }, 0, 0, A | D, .unit = "interpolation"}, + { "sample_rate", "set sample rate", OFFSET(sample_rate), AV_OPT_TYPE_INT, { .i64 = 48000 }, 1000, INT_MAX, A | D }, + { "layout", "set channel layout", OFFSET(ch_layout), AV_OPT_TYPE_CHLAYOUT, { .str = "stereo" }, 0, 0, A | D }, + { "subsong", "set subsong", OFFSET(subsong), AV_OPT_TYPE_INT, { .i64 = -2 }, -2, INT_MAX, A | D, .unit = "subsong"}, + { "all", "all", 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, 0, 0, A | D, .unit = "subsong" }, + { "auto", "auto", 0, AV_OPT_TYPE_CONST, { .i64 = -2 }, 0, 0, A | D, .unit = "subsong" }, + { "interpolation", "set interpolation method", OFFSET(interp), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, A | D, .unit = "interpolation"}, + { "default", "default", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, A | D, .unit = "interpolation"}, + { "none", "none", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, A | D, .unit = "interpolation"}, + { "linear", "linear", 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, 0, 0, A | D, .unit = "interpolation"}, + { "cubic", "cubic", 0, AV_OPT_TYPE_CONST, { .i64 = 4 }, 0, 0, A | D, .unit = "interpolation"}, + { "8-tap-sinc", "8-tap windowed sinc", 0, AV_OPT_TYPE_CONST, { .i64 = 8 }, 0, 0, A | D, .unit = "interpolation"}, { NULL } }; -- 2.49.1

1 0

[RFC] sponsors page
by Michael Niedermayer 31 Oct '25

31 Oct '25

Hi all i was talking with a company, who wants to sponsor FFmpeg they asked if they would be listed in the GitHub readme. I think we should instead add a sponsors.md and link to forgejo of it (forgejo can render .md) or instead put a sponsors.html on our webpage similar to https://www.python.org/psf/sponsors/ the later would be release independant what do people prefer ? should we create that page with the first sponsor or wait until there are multiple sponsors before creating the page ? (Its plausible the first sponsors will be less well known companies) should listing on that page be conditional on some sponsor level ? or just all levels in order Our levels: https://dir.floss.fund/view/funding/@ffmpeg.org (stolen from python) thx -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Some Animals are More Equal Than Others. - George Orwell's book Animal Farm

2 2