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

[PATCH] libavformat.v, libavutil.v: tighten export whitelist
by Scott Theisen 03 Jul '25

03 Jul '25

This matches how the other libraries define their exported symbols. --- libavformat/libavformat.v | 5 ++++- libavutil/libavutil.v | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/libavformat.v b/libavformat/libavformat.v index 47d5ddcdb1..39aa185309 100644 --- a/libavformat/libavformat.v +++ b/libavformat/libavformat.v @@ -1,6 +1,9 @@ LIBAVFORMAT_MAJOR { global: - av*; + av_*; + avformat_*; + avio_*; + avpriv_*; local: *; }; diff --git a/libavutil/libavutil.v b/libavutil/libavutil.v index fb17058df5..e1aab84554 100644 --- a/libavutil/libavutil.v +++ b/libavutil/libavutil.v @@ -1,6 +1,8 @@ LIBAVUTIL_MAJOR { global: - av*; + av_*; + avutil_*; + avpriv_*; local: *; }; -- 2.50.0

3 3

[PATCH] avcodec/mpegvideo_dec: Avoid implicit NULL + offset
by Andreas Rheinhardt 03 Jul '25

03 Jul '25

Patch attached. - Andreas

1 0

[PATCH 01/12] avfilter: factorize requesting an input frame from multi output filters
by Marton Balint 03 Jul '25

03 Jul '25

Signed-off-by: Marton Balint <cus(a)passwd.hu> --- doc/filter_design.txt | 1 + libavfilter/af_acrossover.c | 10 +--------- libavfilter/af_channelsplit.c | 10 +--------- libavfilter/filters.h | 15 +++++++++++++++ libavfilter/split.c | 10 +--------- libavfilter/vf_extractplanes.c | 10 +--------- 6 files changed, 20 insertions(+), 36 deletions(-) diff --git a/doc/filter_design.txt b/doc/filter_design.txt index 885b19b6f6..b6bfca12f5 100644 --- a/doc/filter_design.txt +++ b/doc/filter_design.txt @@ -214,6 +214,7 @@ Frame scheduling FF_FILTER_FORWARD_STATUS(inlink, outlink); FF_FILTER_FORWARD_STATUS_ALL(inlink, filter); FF_FILTER_FORWARD_WANTED(outlink, inlink); + FF_FILTER_FORWARD_WANTED_ANY(filter, inlink); filter_frame ------------ diff --git a/libavfilter/af_acrossover.c b/libavfilter/af_acrossover.c index 2c9a1e00bc..e24bf9eb73 100644 --- a/libavfilter/af_acrossover.c +++ b/libavfilter/af_acrossover.c @@ -588,15 +588,7 @@ static int activate(AVFilterContext *ctx) return 0; } - for (int i = 0; i < ctx->nb_outputs; i++) { - if (ff_outlink_get_status(ctx->outputs[i])) - continue; - - if (ff_outlink_frame_wanted(ctx->outputs[i])) { - ff_inlink_request_frame(inlink); - return 0; - } - } + FF_FILTER_FORWARD_WANTED_ANY(ctx, inlink); return FFERROR_NOT_READY; } diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c index 0156c0c28c..638e81593c 100644 --- a/libavfilter/af_channelsplit.c +++ b/libavfilter/af_channelsplit.c @@ -228,15 +228,7 @@ static int activate(AVFilterContext *ctx) return 0; } - for (int i = 0; i < ctx->nb_outputs; i++) { - if (ff_outlink_get_status(ctx->outputs[i])) - continue; - - if (ff_outlink_frame_wanted(ctx->outputs[i])) { - ff_inlink_request_frame(inlink); - return 0; - } - } + FF_FILTER_FORWARD_WANTED_ANY(ctx, inlink); return FFERROR_NOT_READY; } diff --git a/libavfilter/filters.h b/libavfilter/filters.h index 654aed5c9e..66dc611a98 100644 --- a/libavfilter/filters.h +++ b/libavfilter/filters.h @@ -696,6 +696,21 @@ static inline void ff_outlink_set_status(AVFilterLink *link, int status, int64_t } \ } while (0) +/** + * Forward the frame_wanted_out flag from any of the output links to an input link. + * If the flag is set on any of the outputs, this macro will return immediately. + */ +#define FF_FILTER_FORWARD_WANTED_ANY(filter, inlink) do { \ + for (int i = 0; i < filter->nb_outputs; i++) { \ + if (ff_outlink_get_status(filter->outputs[i])) \ + continue; \ + if (ff_outlink_frame_wanted(filter->outputs[i])) { \ + ff_inlink_request_frame(inlink); \ + return 0; \ + } \ + } \ +} while (0) + /** * Check for flow control between input and output. * This is necessary for filters that may produce several output frames for diff --git a/libavfilter/split.c b/libavfilter/split.c index 0557f54cce..d0bd0c3b2a 100644 --- a/libavfilter/split.c +++ b/libavfilter/split.c @@ -110,15 +110,7 @@ static int activate(AVFilterContext *ctx) return 0; } - for (int i = 0; i < ctx->nb_outputs; i++) { - if (ff_outlink_get_status(ctx->outputs[i])) - continue; - - if (ff_outlink_frame_wanted(ctx->outputs[i])) { - ff_inlink_request_frame(inlink); - return 0; - } - } + FF_FILTER_FORWARD_WANTED_ANY(ctx, inlink); return FFERROR_NOT_READY; } diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c index 337ad12ac7..99e37ba04a 100644 --- a/libavfilter/vf_extractplanes.c +++ b/libavfilter/vf_extractplanes.c @@ -367,15 +367,7 @@ static int activate(AVFilterContext *ctx) return 0; } - for (int i = 0; i < ctx->nb_outputs; i++) { - if (ff_outlink_get_status(ctx->outputs[i])) - continue; - - if (ff_outlink_frame_wanted(ctx->outputs[i])) { - ff_inlink_request_frame(inlink); - return 0; - } - } + FF_FILTER_FORWARD_WANTED_ANY(ctx, inlink); return FFERROR_NOT_READY; } -- 2.43.0

3 15

Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Passthrough SCTE 35 Current behavior breaks SCTE 35 by wrapping it in a PES packet, this adds the logic for the SCTE 35 messages to be passed through cleanly.
by Gregor Fuis 03 Jul '25

03 Jul '25

Hi Pierre, Do you maybe have a patch that would work with the latest ffmpeg version? Best Regards, Gregor On Thu, Jun 12, 2025 at 10:48 AM Pierre Le Fevre via ffmpeg-devel < ffmpeg-devel(a)ffmpeg.org> wrote: > > > > ---------- Forwarded message ---------- > From: Pierre Le Fevre <pierre.lefevre(a)netinsight.net> > To: FFmpeg development discussions and patches <ffmpeg-devel(a)ffmpeg.org> > Cc: > Bcc: > Date: Thu, 12 Jun 2025 08:48:09 +0000 > Subject: Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Passthrough SCTE 35 > Current behavior breaks SCTE 35 by wrapping it in a PES packet, this adds > the logic for the SCTE 35 messages to be passed through cleanly. > Hi Devin, > I saw your patch but noticed it was still not merged. Since it’s more > comprehensive, I’m all for merging your patch instead of mine if it’s not > too stale. > > Best, > Pierre > > From: ffmpeg-devel <ffmpeg-devel-bounces(a)ffmpeg.org> on behalf of Devin > Heitmueller <devin.heitmueller(a)ltnglobal.com> > Date: Wednesday, 11 June 2025 at 16:32 > To: FFmpeg development discussions and patches <ffmpeg-devel(a)ffmpeg.org> > Cc: Pierre Le Fevre <pierre.lefevre(a)netinsight.net> > Subject: Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Passthrough SCTE 35 > Current behavior breaks SCTE 35 by wrapping it in a PES packet, this adds > the logic for the SCTE 35 messages to be passed through cleanly. > *EXTERNAL EMAIL*- Use caution before opening links or attachments > > Hello Pierre, > > On Wed, Jun 11, 2025 at 10:22 AM Pierre Le Fevre via ffmpeg-devel > <ffmpeg-devel(a)ffmpeg.org> wrote: > > ---------- Forwarded message ---------- > > From: Pierre Le Fevre <pierre.lefevre(a)netinsight.net> > > To: "ffmpeg-devel(a)ffmpeg.org" <ffmpeg-devel(a)ffmpeg.org> > > Cc: > > Bcc: > > Date: Wed, 11 Jun 2025 14:22:29 +0000 > > Subject: [PATCH] avformat/mpegts: Passthrough SCTE 35 Current behavior > breaks SCTE 35 by wrapping it in a PES packet, this adds the logic for the > SCTE 35 messages to be passed through cleanly. > > Signed-off-by: Pierre Le Fevre <pierre.lefevre(a)netinsight.net> > > For what it's worth, I submitted a similar patch series a couple of > years ago, which also accommodates modifying the pts_adjust field > (which is mandatory if the output stream's clocks are rebased). > > https://ffmpeg.org/pipermail/ffmpeg-devel/2023-July/312417.html > > Devin > -- > Devin Heitmueller, Senior Software Engineer > LTN Global Communications > o: +1 (301) 363-1001 > w: https://ltnglobal.com e: devin.heitmueller(a)ltnglobal.com > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel(a)ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request(a)ffmpeg.org with subject "unsubscribe". > > > > ---------- Forwarded message ---------- > From: Pierre Le Fevre via ffmpeg-devel <ffmpeg-devel(a)ffmpeg.org> > To: FFmpeg development discussions and patches <ffmpeg-devel(a)ffmpeg.org> > Cc: Pierre Le Fevre <pierre.lefevre(a)netinsight.net> > Bcc: > Date: Thu, 12 Jun 2025 08:48:09 +0000 > Subject: Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Passthrough SCTE 35 > Current behavior breaks SCTE 35 by wrapping it in a PES packet, this adds > the logic for the SCTE 35 messages to be passed through cleanly. > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel(a)ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request(a)ffmpeg.org with subject "unsubscribe". >

1 0

[PATCH 1/5] avcodec/get_buffer: Use av_buffer_mallocz() for audio same as its done for video
by Michael Niedermayer 03 Jul '25

03 Jul '25

Fixes: Use of uninintialized value Fixes: 70993/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_LATM_fuzzer-6378949754552320 For the AAC/USAC/SBR code which reads uninitialized memory, it would be good, if it did not a fix for that is welcome! Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/get_buffer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/get_buffer.c b/libavcodec/get_buffer.c index ff19f61e86b..7e705380fc6 100644 --- a/libavcodec/get_buffer.c +++ b/libavcodec/get_buffer.c @@ -142,7 +142,10 @@ static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame) if (ret < 0) goto fail; - pool->pools[0] = av_buffer_pool_init(pool->linesize[0], NULL); + pool->pools[0] = av_buffer_pool_init(pool->linesize[0], + CONFIG_MEMORY_POISONING ? + NULL : + av_buffer_allocz); if (!pool->pools[0]) { ret = AVERROR(ENOMEM); goto fail; -- 2.46.0

3 13

[PATCH 0/4] Check sample rate generically
by ffmpegagent 03 Jul '25

03 Jul '25

This is an alternative to https://ffmpeg.org/pipermail/ffmpeg-devel/2025-June/345575.html. Andreas Rheinhardt (4): avcodec/avcodec: Check sample_rate generically avcodec/wma,wmaprodec: Remove always-false checks avcodec/wma: Remove redundant nb_channels check avcodec/wmaprodec: Avoid branch for setting block_align libavcodec/avcodec.c | 6 +++++- libavcodec/encode.c | 5 ----- libavcodec/wma.c | 4 ++-- libavcodec/wmaprodec.c | 20 +++++++------------- 4 files changed, 14 insertions(+), 21 deletions(-) base-commit: 34953e195fe108224abdfe25d147f1a7ba5477c8 Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-101%2Fmkver%2… Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-101/mkver/sample_rate_check-v1 Pull-Request: https://github.com/ffstaging/FFmpeg/pull/101 -- ffmpeg-codebot

3 5

[PATCH] avcodec/dfpwmenc: Correctly pad input
by Andreas Rheinhardt 03 Jul '25

03 Jul '25

Patch attached. - Andreas

1 2

[PATCH 00/48] H263DecContext
by ffmpegagent 03 Jul '25

03 Jul '25

This patchset adds a H263DecContext and moves the fields of MpegEncContext that are only used by the H.263-based decoders (those using h263dec.c) to it. It also adds a special slice context for the MPEG-1/2 decoders and moves the GetBitContext from MpegEncContext to the actual decoder contexts (no get_bits.h inclusion in encoders any longer). Furthermore, MpegEncContext. is put into the codec contexts and no longer separately allocated. Andreas Rheinhardt (48): avcodec/ituh263dec: Use correct logcontext avcodec/rl: Avoid branch in index lookup avcodec/ituh263enc: Simplify creating LUT avcodec/ituh263dec: Only initialize ff_h263_rl_inter when needed avcodec/mpegvideoenc: Allocate blocks as part of MPVEncContext avcodec/mpegvideo: Add MPVContext typedef avcodec/mpegvideo_dec: Factor debugging dct coefficients out avcodec/mpegvideo_dec: Reindent after the previous commit avcodec/mpeg_er: Don't use MpegEncContext.block avcodec/mpegvideodec: Remove size expectation from ff_mpv_reconstruct_mb avcodec/h261dec: Stop using MpegEncContext.gb avcodec/h261dec: Don't use MpegEncContext.block avcodec/mpeg12dec: Put GetBitContext on the stack where advantageous avcodec/mpeg12dec: Remove unused function parameter avcodec/rv34: Don't use MpegEncContext.gb avcodec/rv34: Don't use MpegEncContext.block avcodec/intrax8: Don't pretend to need more than one int16_t[64] avcodec/vc1: Stop using MpegEncContext.gb avcodec/vc1: Don't use MpegEncContext.block avcodec/mpeg12dec: Deduplicate variables avcodec/mpegvideo: Move flipflop_rounding to {MSMPEG4Dec,MPVEnc}Context avcodec/mpegvideo: Move unrestricted_mv to MotionEstContext avcodec/mpeg4videodec: Avoid unnecessary indirections avcodec/{h263,mpeg4video}dec: Pass MPVContext*, not Mpeg4DecContext* avcodec/mpegvideo: Move dct_precision to Mpeg4DecContext avcodec/h263dec: Add H263DecContext avcodec/h263dec: Remove redundant block parameter from decode_mb avcodec/h263dec: Don't use MpegEncContext.block avcodec/h263dec: Stop using MpegEncContext.gb avcodec/mpeg12dec: Add Mpeg12SliceContext avcodec/mpegvideo: Add missing headers avcodec/mpeg12dec: Move MpegEncContext.gb to Mpeg12SliceContext avcodec/mpeg12dec: Don't use MPVContext.block avcodec/mpegvideo: Move fields only used by H.263 decoders to H263DecCtx avcodec/mpegvideo: Move mb_num_left to {H263,RV34}DecContext avcodec/mpeg12dec: Put mb_skip_run on the stack avcodec/mpegvideo: Move mb_skip_run to {RV34Dec,MPVEnc}Context avcodec/mpegvideo: Move SLICE_* defs to h263dec.h, h261dec.c avcodec/msmpeg4dec: Move ff_msmpeg4_decode_init() down avcodec/h263dec: Use function ptr for decode_picture_header avcodec/ituh263enc: Inline value of h263_flv avcodec/flvdec: Binarize h263_flv avcodec/mpegvideo: Move fields to {H263Dec,MPVEnc}Context when possible avcodec/mpeg_er: Allow to skip setting partitioned_frame, p[pb]_time avcodec/mpegvideo: Move partitioned_frame to {H263Dec,MPVEnc}Context avcodec/mpegvideo: Move loop_filter to {H263Dec,MPVEnc,VC1}Context avcodec/rv34: Don't report progress unnecessarily avcodec/rv34: Fix spelling mistake libavcodec/dxva2_vc1.c | 6 +- libavcodec/error_resilience.c | 2 + libavcodec/flvdec.c | 60 +- libavcodec/flvdec.h | 4 +- libavcodec/flvenc.c | 4 +- libavcodec/h261dec.c | 95 +- libavcodec/h261enc.c | 18 +- libavcodec/h263data.h | 4 + libavcodec/h263dec.c | 427 +++--- libavcodec/h263dec.h | 81 +- libavcodec/h263enc.h | 2 +- libavcodec/intelh263dec.c | 110 +- libavcodec/intrax8.c | 16 +- libavcodec/intrax8.h | 4 +- libavcodec/ituh263dec.c | 950 ++++++------- libavcodec/ituh263enc.c | 112 +- libavcodec/me_cmp.c | 1 + libavcodec/mips/mpegvideo_msa.c | 1 + libavcodec/motion_est.c | 4 +- libavcodec/motion_est.h | 1 + libavcodec/mpeg12dec.c | 909 +++++++------ libavcodec/mpeg12enc.c | 11 +- libavcodec/mpeg4video_parser.c | 4 +- libavcodec/mpeg4videodec.c | 1741 ++++++++++++------------ libavcodec/mpeg4videodec.h | 13 +- libavcodec/mpeg4videoenc.c | 21 +- libavcodec/mpeg_er.c | 7 +- libavcodec/mpeg_er.h | 9 + libavcodec/mpegvideo.c | 28 +- libavcodec/mpegvideo.h | 49 +- libavcodec/mpegvideo_dec.c | 37 +- libavcodec/mpegvideo_enc.c | 178 +-- libavcodec/mpegvideodec.h | 8 +- libavcodec/mpegvideoenc.h | 21 + libavcodec/msmpeg4.c | 1 + libavcodec/msmpeg4dec.c | 586 ++++---- libavcodec/msmpeg4dec.h | 11 +- libavcodec/msmpeg4enc.c | 10 +- libavcodec/mss2.c | 6 +- libavcodec/nvdec_mpeg4.c | 4 +- libavcodec/nvdec_vc1.c | 2 +- libavcodec/ppc/mpegvideo_altivec.c | 1 + libavcodec/ratecontrol.c | 4 +- libavcodec/rl.h | 6 +- libavcodec/rv10.c | 340 ++--- libavcodec/rv10dec.h | 4 +- libavcodec/rv20enc.c | 12 +- libavcodec/rv30.c | 2 +- libavcodec/rv34.c | 61 +- libavcodec/rv34.h | 6 + libavcodec/rv40.c | 10 +- libavcodec/snowenc.c | 4 +- libavcodec/speedhqenc.c | 1 + libavcodec/svq1enc.c | 2 +- libavcodec/vaapi_mpeg4.c | 12 +- libavcodec/vaapi_vc1.c | 4 +- libavcodec/vc1.c | 30 +- libavcodec/vc1.h | 7 + libavcodec/vc1_block.c | 134 +- libavcodec/vc1_pred.c | 12 +- libavcodec/vc1dec.c | 54 +- libavcodec/vdpau_mpeg4.c | 2 +- libavcodec/vdpau_vc1.c | 2 +- libavcodec/wmv2.h | 4 +- libavcodec/wmv2dec.c | 326 ++--- libavcodec/wmv2dec.h | 4 +- libavcodec/wmv2enc.c | 8 +- libavcodec/x86/mpegvideo.c | 2 +- libavcodec/x86/mpegvideoenc.c | 1 - libavcodec/x86/mpegvideoenc_template.c | 1 + 70 files changed, 3347 insertions(+), 3267 deletions(-) base-commit: e6298e0759430f64e9bd9298775de92597be8a50 Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-102%2Fmkver%2… Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-102/mkver/H263DecContext-v1 Pull-Request: https://github.com/ffstaging/FFmpeg/pull/102 -- ffmpeg-codebot

3 49

[PATCH 1/8] tests/fate/screen: Add test for skipping cursor with FIC
by Andreas Rheinhardt 03 Jul '25

03 Jul '25

Patches attached. - Andreas

1 1

[PATCH v3] mpegtsenc: Add SYNC KLV metadata descriptors (MISB ST1402)
by Caleb Sawyer 03 Jul '25

03 Jul '25

From: Caleb Sawyer <caleb.sawyer(a)gsdeng.com> Added metadata_descriptor and metadata_std_descriptor to the PMT for synchronous KLV streams. Asynchronous KLV streams remain as they were. The descriptors are required by MISB ST-1402.2 and are in accordance with ISO/IEC 13818-1. Signed-off-by: Caleb Sawyer <caleb.sawyer(a)gsdeng.com> --- libavformat/mpegtsenc.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 6935b71cfe..e99e189299 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -814,7 +814,28 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) break; case AVMEDIA_TYPE_DATA: if (codec_id == AV_CODEC_ID_SMPTE_KLV) { - put_registration_descriptor(&q, MKTAG('K', 'L', 'V', 'A')); + if (st->codecpar->profile == AV_PROFILE_KLVA_SYNC) { + const char *fmtIdent = "KLVA"; + *q++ = METADATA_DESCRIPTOR; + *q++ = 9; /* descriptor length */ + put16(&q, 0x0100); /* metadata_application_format */ + *q++ = 0xff; /* metadata_format */ + putbuf(&q, fmtIdent, 4); /* KLVA */ + *q++ = 0x00; /* metadata_service_id */ + *q++ = 0x0f; /* decoder_config_flags, DSM-CC_flat, reserved */ + *q++ = METADATA_STD_DESCRIPTOR; + *q++ = 9; /* descriptor length */ + *q++ = 0xc0; + put16(&q, 0x0000); /* reserved, metadata_input_leak_rate 0x01c4 */ + *q++ = 0xc0; + put16(&q, 0x0000); /* reserved, metadata_buffer_size 0x0400 */ + *q++ = 0xc0; + put16(&q, 0x0000); /* reserved, metadata_output_leak_rate */ + } else { + put_registration_descriptor(&q, MKTAG('K', 'L', 'V', 'A')); + } + } else if (codec_id == AV_CODEC_ID_SMPTE_2038) { + put_registration_descriptor(&q, MKTAG('V', 'A', 'N', 'C')); } else if (codec_id == AV_CODEC_ID_SMPTE_2038) { put_registration_descriptor(&q, MKTAG('V', 'A', 'N', 'C')); } else if (codec_id == AV_CODEC_ID_TIMED_ID3) { -- 2.47.1.windows.1

1 0