January 2026 - ffmpeg-devel - lists.ffmpeg.org

[GSoC 2026] Qualification Task – SubViewer Decoder Patch
by Nariman Sayed 18 Feb '26

18 Feb '26

Hello FFmpeg Developers, My name is Nariman, and I am applying for GSoC 2026 for the EIA-608 Closed Captions Modernization project. As a Qualification Task, I have fixed a small bug in FFmpeg’s SubViewer subtitle decoder by adding a null pointer check in the function `subviewer_decode_frame`. This demonstrates my ability to read FFmpeg code, understand its APIs, and safely apply changes. Please find my patch attached: Attachment: 0001-avcodec-subviewerdec-add-null-pointer-check-in-subvi.patch I am eager to contribute to the EIA-608 project, learn about digital video fundamentals, and improve FFmpeg’s Closed Captions code base. Thank you for your time and consideration. Best regards, Nariman

3 11

[PR] lavf/bwdif: fix heap-buffer-overflow with small height videos (PR #21574)
by Jun Zhao 17 Feb '26

17 Feb '26

PR #21574 opened by Jun Zhao (mypopydev) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21574 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21574.patch Reproduce: ffmpeg -i /tmp/bwdif_test_input_160x4_gray16.jpg -vf "bwdif" -f null - filter_intra accesses rows 3 lines away via cur[mrefs3] and cur[prefs3]. For small height videos (h <= 4), this causes heap-buffer-overflow. Consolidate boundary checks before filter_intra. Fall back to filter_edge for edge cases (y < 4 or y + 5 > td->h), avoiding duplicate filter_edge calls for both YADIF_FIELD_END and normal paths. Test file: 160x4 gray16 JPEG https://code.ffmpeg.org/attachments/db2ace24-bc00-4af6-a53a-5df6b0d51b15 fix #21570 Signed-off-by: Jun Zhao <barryjzhao(a)tencent.com> From 2fb2658515f7fb0d47ca4710f2ebd672934497c0 Mon Sep 17 00:00:00 2001 From: Jun Zhao <barryjzhao(a)tencent.com> Date: Sun, 25 Jan 2026 10:31:48 +0800 Subject: [PATCH] lavf/bwdif: fix heap-buffer-overflow with small height videos Reproduce: ffmpeg -i /tmp/bwdif_test_input_160x4_gray16.jpg -vf "bwdif" -f null - filter_intra accesses rows 3 lines away via cur[mrefs3] and cur[prefs3]. For small height videos (h <= 4), this causes heap-buffer-overflow. Consolidate boundary checks before filter_intra. Fall back to filter_edge for edge cases (y < 4 or y + 5 > td->h), avoiding duplicate filter_edge calls for both YADIF_FIELD_END and normal paths. Test file: 160x4 gray16 JPEG https://code.ffmpeg.org/attachments/db2ace24-bc00-4af6-a53a-5df6b0d51b15 fix #21570 Signed-off-by: Jun Zhao <barryjzhao(a)tencent.com> --- libavfilter/vf_bwdif.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c index d49f3f66d6..4780b98508 100644 --- a/libavfilter/vf_bwdif.c +++ b/libavfilter/vf_bwdif.c @@ -76,19 +76,21 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) uint8_t *cur = &yadif->cur ->data[td->plane][y * linesize]; uint8_t *next = &yadif->next->data[td->plane][y * linesize]; uint8_t *dst = &td->frame->data[td->plane][y * td->frame->linesize[td->plane]]; - if (yadif->current_field == YADIF_FIELD_END) { - s->dsp.filter_intra(dst, cur, td->w, (y + df) < td->h ? refs : -refs, - y > (df - 1) ? -refs : refs, - (y + 3*df) < td->h ? 3 * refs : -refs, - y > (3*df - 1) ? -3 * refs : refs, - td->parity ^ td->tff, clip_max); - } else if ((y < 4) || ((y + 5) > td->h)) { + int is_edge = (y < 4) || ((y + 5) > td->h); + + if (is_edge) { s->dsp.filter_edge(dst, prev, cur, next, td->w, (y + df) < td->h ? refs : -refs, y > (df - 1) ? -refs : refs, refs << 1, -(refs << 1), td->parity ^ td->tff, clip_max, (y < 2) || ((y + 3) > td->h) ? 0 : 1); + } else if (yadif->current_field == YADIF_FIELD_END) { + s->dsp.filter_intra(dst, cur, td->w, (y + df) < td->h ? refs : -refs, + y > (df - 1) ? -refs : refs, + (y + 3*df) < td->h ? 3 * refs : -refs, + y > (3*df - 1) ? -3 * refs : refs, + td->parity ^ td->tff, clip_max); } else if (s->dsp.filter_line3 && y + 2 < slice_end && y + 6 < td->h) { s->dsp.filter_line3(dst, td->frame->linesize[td->plane], prev, cur, next, linesize, td->w, -- 2.52.0

2 1

[PATCH] doc/Makefile: add MAKEINFO variable
by Patrice Dumas 16 Feb '26

16 Feb '26

To allow building doc with another makeinfo command than the system one. --- doc/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 2112aff737..608759216c 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -50,11 +50,12 @@ apidoc: doc/doxy/html documentation: $(DOCS) TEXIDEP = perl $(SRC_PATH)/doc/texidep.pl $(SRC_PATH) $< $@ >$(@:%=%.d) +MAKEINFO = makeinfo doc/%.txt: TAG = TXT doc/%.txt: doc/%.texi $(Q)$(TEXIDEP) - $(M)makeinfo --force --no-headers -o $@ $< 2>/dev/null + $(M)$(MAKEINFO) --force --no-headers -o $@ $< 2>/dev/null GENTEXI = format codec GENTEXI := $(GENTEXI:%=doc/avoptions_%.texi) @@ -69,11 +70,11 @@ doc/%-all.html: TAG = HTML ifdef HAVE_MAKEINFO_HTML doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.pm $(GENTEXI) $(Q)$(TEXIDEP) - $(M)makeinfo --html -I doc --no-split -D config-not-all --init-file=$(SRC_PATH)/doc/t2h.pm --output $@ $< + $(M)$(MAKEINFO) --html -I doc --no-split -D config-not-all --init-file=$(SRC_PATH)/doc/t2h.pm --output $@ $< doc/%-all.html: doc/%.texi $(SRC_PATH)/doc/t2h.pm $(GENTEXI) $(Q)$(TEXIDEP) - $(M)makeinfo --html -I doc --no-split -D config-all --init-file=$(SRC_PATH)/doc/t2h.pm --output $@ $< + $(M)$(MAKEINFO) --html -I doc --no-split -D config-all --init-file=$(SRC_PATH)/doc/t2h.pm --output $@ $< else doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.init $(GENTEXI) $(Q)$(TEXIDEP) -- 2.51.0

2 4

[PATCH] lavf/whip: improve RTP muxer error message
by Devraj Ajmera 11 Feb '26

11 Feb '26

Hello, This patch improves the error message shown when the RTP muxer cannot be guessed in the WHIP muxer, making the failure reason clearer to users. Regards, Devraj Ajmera

3 11

[PATCH] avfilter/x86/vf_nlmeans: add AVX2 safe ssd integral image
by Andy Wu 02 Feb '26

02 Feb '26

Add an AVX2 implementation of compute_safe_ssd_integral_image used by vf_nlmeans. checkasm: vf_nlmeans bench: (x86_64, Linux) ssd_integral_image 1.93x bench: (x86_64, Windows/MSVC) ssd_integral_image 1.71x Signed-off-by: Andy Wu <lpageo(a)163.com> --- libavfilter/x86/vf_nlmeans.asm | 114 ++++++++++++++++++++++++++++++ libavfilter/x86/vf_nlmeans_init.c | 9 ++- 2 files changed, 122 insertions(+), 1 deletion(-) diff --git a/libavfilter/x86/vf_nlmeans.asm b/libavfilter/x86/vf_nlmeans.asm index 8f57801035..c61593b916 100644 --- a/libavfilter/x86/vf_nlmeans.asm +++ b/libavfilter/x86/vf_nlmeans.asm @@ -37,6 +37,120 @@ ending_lut: dd -1, -1, -1, -1, -1, -1, -1, -1,\ SECTION .text +; void ff_compute_safe_ssd_integral_image(uint32_t *dst, ptrdiff_t dst_linesize_32, +; const uint8_t *s1, ptrdiff_t linesize1, +; const uint8_t *s2, ptrdiff_t linesize2, +; int w, int h); +; +; Assumptions (see C version): +; - w is multiple of 16 and w >= 16 +; - h >= 1 +; - dst[-1] and dst_top[-1] are readable + +INIT_YMM avx2 +cglobal compute_safe_ssd_integral_image, 8, 14, 6, 0, dst, dst_lz, s1, ls1, s2, ls2, w, h, dst_top, dst_stride, x, carry, tmp + mov wd, dword wm + mov hd, dword hm + movsxd wq, wd + + mov dst_strideq, dst_lzq + shl dst_strideq, 2 + mov dst_topq, dstq + sub dst_topq, dst_strideq + +.yloop: + xor xq, xq + mov carryd, [dstq - 4] + +.xloop: + ; ---- process 8 pixels ---- + pmovzxbd m0, [s1q + xq] + pmovzxbd m1, [s2q + xq] + psubd m0, m1 + pmulld m0, m0 + + movu m1, [dst_topq + xq*4] + movu m2, [dst_topq + xq*4 - 4] + psubd m1, m2 + paddd m0, m1 + + mova m5, m0 + pslldq m5, 4 + paddd m0, m5 + mova m5, m0 + pslldq m5, 8 + paddd m0, m5 + mova m5, m0 + pslldq m5, 16 + paddd m0, m5 + + vextracti128 xm5, m0, 0 + pshufd xm5, xm5, 0xff + pxor m4, m4 + vinserti128 m4, m4, xm5, 1 + paddd m0, m4 + + movd xm5, carryd + vpbroadcastd m4, xm5 + paddd m0, m4 + + movu [dstq + xq*4], m0 + + vextracti128 xm5, m0, 1 + pshufd xm5, xm5, 0xff + movd carryd, xm5 + + add xq, 8 + + ; ---- process 8 pixels ---- + pmovzxbd m0, [s1q + xq] + pmovzxbd m1, [s2q + xq] + psubd m0, m1 + pmulld m0, m0 + + movu m1, [dst_topq + xq*4] + movu m2, [dst_topq + xq*4 - 4] + psubd m1, m2 + paddd m0, m1 + + mova m5, m0 + pslldq m5, 4 + paddd m0, m5 + mova m5, m0 + pslldq m5, 8 + paddd m0, m5 + mova m5, m0 + pslldq m5, 16 + paddd m0, m5 + + vextracti128 xm5, m0, 0 + pshufd xm5, xm5, 0xff + pxor m4, m4 + vinserti128 m4, m4, xm5, 1 + paddd m0, m4 + + movd xm5, carryd + vpbroadcastd m4, xm5 + paddd m0, m4 + + movu [dstq + xq*4], m0 + + vextracti128 xm5, m0, 1 + pshufd xm5, xm5, 0xff + movd carryd, xm5 + + add xq, 8 + cmp xq, wq + jl .xloop + + add s1q, ls1q + add s2q, ls2q + add dstq, dst_strideq + add dst_topq, dst_strideq + dec hd + jg .yloop + RET + ; void ff_compute_weights_line(const uint32_t *const iia, ; const uint32_t *const iib, ; const uint32_t *const iid, diff --git a/libavfilter/x86/vf_nlmeans_init.c b/libavfilter/x86/vf_nlmeans_init.c index 0adb2c7e8a..5bfdc7e028 100644 --- a/libavfilter/x86/vf_nlmeans_init.c +++ b/libavfilter/x86/vf_nlmeans_init.c @@ -20,6 +20,11 @@ #include "libavutil/x86/cpu.h" #include "libavfilter/vf_nlmeans.h" +void ff_compute_safe_ssd_integral_image_avx2(uint32_t *dst, ptrdiff_t dst_linesize_32, + const uint8_t *s1, ptrdiff_t linesize1, + const uint8_t *s2, ptrdiff_t linesize2, + int w, int h); + void ff_compute_weights_line_avx2(const uint32_t *const iia, const uint32_t *const iib, const uint32_t *const iid, @@ -36,7 +41,9 @@ av_cold void ff_nlmeans_init_x86(NLMeansDSPContext *dsp) #if ARCH_X86_64 int cpu_flags = av_get_cpu_flags(); - if (EXTERNAL_AVX2_FAST(cpu_flags)) + if (EXTERNAL_AVX2_FAST(cpu_flags)) { + dsp->compute_safe_ssd_integral_image = ff_compute_safe_ssd_integral_image_avx2; dsp->compute_weights_line = ff_compute_weights_line_avx2; + } #endif } -- 2.43.0

2 1

Re: [FFmpeg-cvslog] [ffmpeg] branch master updated. fd1fd5850d fftools/ffmpeg_sched: unchoke upstream nodes on recv-closed filter inputs
by Michael Niedermayer 01 Feb '26

01 Feb '26

Hi 56d9ca69d7f229dccee6ad47c67a37f558196fb7 introduces a "use after free" with a srt file as input like this: 1 00:00:00,000 --> 00:00:01,000 Test valgrind ./ffmpeg_g -i test.srt -f hls t.m3u8 you get this in about 50% of the runs I noticed this issue when debuging the format string issue submited by Sarthak Munshi ==3961210== Thread 2: ==3961210== Invalid read of size 1 ==3961210== at 0x4853DF0: __memcpy_chk (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so) ==3961210== by 0x324297: enc_open (in ffmpeg/ffmpeg_g) ==3961210== by 0x325F59: encoder_thread (in ffmpeg/ffmpeg_g) ==3961210== by 0x33E9AF: task_wrapper (in ffmpeg/ffmpeg_g) ==3961210== by 0x740BAA3: start_thread (pthread_create.c:447) ==3961210== by 0x7498A63: clone (clone.S:100) ==3961210== Address 0xca93ac4 is 580 bytes inside a block of size 582 free'd ==3961210== at 0x484988F: free (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so) ==3961210== by 0x29824A: ff_codec_close (in ffmpeg/ffmpeg_g) ==3961210== by 0xD101FC: avcodec_free_context (in ffmpeg/ffmpeg_g) ==3961210== by 0x31C768: decoder_thread (in ffmpeg/ffmpeg_g) ==3961210== by 0x33E9AF: task_wrapper (in ffmpeg/ffmpeg_g) ==3961210== by 0x740BAA3: start_thread (pthread_create.c:447) ==3961210== by 0x7498A63: clone (clone.S:100) ==3961210== Block was alloc'd at ==3961210== at 0x484E366: posix_memalign (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so) ==3961210== by 0x1871164: av_malloc (in ffmpeg/ffmpeg_g) ==3961210== by 0x184E70A: av_asprintf (in ffmpeg/ffmpeg_g) ==3961210== by 0x1301482: ff_ass_subtitle_header_full (in ffmpeg/ffmpeg_g) ==3961210== by 0x13014FA: ff_ass_subtitle_header (in ffmpeg/ffmpeg_g) ==3961210== by 0x130152B: ff_ass_subtitle_header_default (in ffmpeg/ffmpeg_g) ==3961210== by 0x9464B6: avcodec_open2 (in ffmpeg/ffmpeg_g) ==3961210== by 0x31B996: dec_open (in ffmpeg/ffmpeg_g) ==3961210== by 0x31E23F: dec_init (in ffmpeg/ffmpeg_g) ==3961210== by 0x3212D5: ist_use (in ffmpeg/ffmpeg_g) ==3961210== by 0x331FAC: ost_add (in ffmpeg/ffmpeg_g) ==3961210== by 0x333E40: map_auto_subtitle (in ffmpeg/ffmpeg_g) ==3961210== ==3961210== Invalid read of size 1 ==3961210== at 0x4853DFD: __memcpy_chk (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so) ==3961210== by 0x324297: enc_open (in ffmpeg/ffmpeg_g) ==3961210== by 0x325F59: encoder_thread (in ffmpeg/ffmpeg_g) ==3961210== by 0x33E9AF: task_wrapper (in ffmpeg/ffmpeg_g) ==3961210== by 0x740BAA3: start_thread (pthread_create.c:447) ==3961210== by 0x7498A63: clone (clone.S:100) ==3961210== Address 0xca93ac2 is 578 bytes inside a block of size 582 free'd ==3961210== at 0x484988F: free (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so) ==3961210== by 0x29824A: ff_codec_close (in ffmpeg/ffmpeg_g) ==3961210== by 0xD101FC: avcodec_free_context (in ffmpeg/ffmpeg_g) ==3961210== by 0x31C768: decoder_thread (in ffmpeg/ffmpeg_g) ==3961210== by 0x33E9AF: task_wrapper (in ffmpeg/ffmpeg_g) ==3961210== by 0x740BAA3: start_thread (pthread_create.c:447) ==3961210== by 0x7498A63: clone (clone.S:100) ==3961210== Block was alloc'd at ==3961210== at 0x484E366: posix_memalign (in /usr/libexec/valgrind/vgpreload_memcheck-amd64-linux.so) ==3961210== by 0x1871164: av_malloc (in ffmpeg/ffmpeg_g) ==3961210== by 0x184E70A: av_asprintf (in ffmpeg/ffmpeg_g) ==3961210== by 0x1301482: ff_ass_subtitle_header_full (in ffmpeg/ffmpeg_g) ==3961210== by 0x13014FA: ff_ass_subtitle_header (in ffmpeg/ffmpeg_g) ==3961210== by 0x130152B: ff_ass_subtitle_header_default (in ffmpeg/ffmpeg_g) ==3961210== by 0x9464B6: avcodec_open2 (in ffmpeg/ffmpeg_g) ==3961210== by 0x31B996: dec_open (in ffmpeg/ffmpeg_g) ==3961210== by 0x31E23F: dec_init (in ffmpeg/ffmpeg_g) ==3961210== by 0x3212D5: ist_use (in ffmpeg/ffmpeg_g) ==3961210== by 0x331FAC: ost_add (in ffmpeg/ffmpeg_g) ==3961210== by 0x333E40: map_auto_subtitle (in ffmpeg/ffmpeg_g) [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB If you fake or manipulate statistics in a paper in physics you will never get a job again. If you fake or manipulate statistics in a paper in medicin you will get a job for life at the pharma industry.

2 4

Fosdem room?
by Vittorio Giovara 31 Jan '26

31 Jan '26

Hi, Is there a tech room planned on Sunday for FOSDEM? Thanks Vittorio Sent from my iPhone

2 1

Subject: Re: [PATCH] avfilter/x86/vf_nlmeans: add AVX2 safe ssd integral image
by 吴佳翮 31 Jan '26

31 Jan '26

Subject: Re: [PATCH] avfilter/x86/vf_nlmeans: add AVX2 safe ssd integral image Hi, Ping for review. This patch adds AVX2 assembly optimization for nlmeans integral image computation, submitted 3 weeks ago. Is there any feedback or testing needed from my side? Thanks, Andywu

1 0

[PR] Add better logging names to URLContext (PR #21618)
by Niklas Haas 31 Jan '26

31 Jan '26

PR #21618 opened by Niklas Haas (haasn) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21618 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21618.patch Currently, protocols like `cache:` or `http:` just log all messages under the default identifier `cache`, which is a bit nondescriptive and presents ambiguity when using multiple such protocols at the same time. This series of changes adds some ability for URLContexts to influence their own log output; and adds a proof of concept to `cache`, `file` and `http`. Results in log output like: ``` [cache:http:V9b0kRNUty7WwP.ts @ 0x224a15c0] Statistics, cache hits:10 cache misses:87 ``` For what used to be just: ``` [cache @ 0x224a15c0] Statistics, cache hits:10 cache misses:87 ``` From 3d09d265fd9ffc22fceb04d37f8583c7dd97e642 Mon Sep 17 00:00:00 2001 From: Niklas Haas <git(a)haasn.dev> Date: Sat, 31 Jan 2026 12:36:52 +0100 Subject: [PATCH 1/4] avformat/avio: add ffurl_item_name() And use it for logging. The reason I decided to expose this as a helper is because it will allow URL protocols that wrap other URL protocols to more easily create "recursive" names that reflect the hierarchy. This change also allows URL protocols to attach custom names to a URLContext by overriding the priv_data class item_name() method. --- libavformat/avio.c | 16 ++++++++++++---- libavformat/url.h | 5 +++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index b146ac9f19..7b1b0f13bf 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -37,13 +37,21 @@ /** @name Logging context. */ /*@{*/ +const char *ffurl_item_name(URLContext *h) +{ + if (h->priv_data) { + const AVClass *c = *(AVClass **) h->priv_data; + return c->item_name(h->priv_data); + } else if (h->prot) { + return h->prot->name; + } else + return "NULL"; +} + static const char *urlcontext_to_name(void *ptr) { URLContext *h = (URLContext *)ptr; - if (h->prot) - return h->prot->name; - else - return "NULL"; + return ffurl_item_name(h); } static void *urlcontext_child_next(void *obj, void *prev) diff --git a/libavformat/url.h b/libavformat/url.h index 0784d77b64..eb1f285958 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -48,6 +48,11 @@ typedef struct URLContext { int min_packet_size; /**< if non zero, the stream is packetized with this min packet size */ } URLContext; +/** + * Get the (friendly) name of a URLContext, for debugging / logging purposes. + */ +const char *ffurl_item_name(URLContext *h); + typedef struct URLProtocol { const char *name; int (*url_open)( URLContext *h, const char *url, int flags); -- 2.52.0 From ea7cea342d6cde590f5eef4af886dbaced93f104 Mon Sep 17 00:00:00 2001 From: Niklas Haas <git(a)haasn.dev> Date: Sat, 31 Jan 2026 12:41:06 +0100 Subject: [PATCH 2/4] avformat/file: use file basename for logging purposes This is perhaps not immediately useful on its own, since file.c does not really log anything, but is useful when accessed recursively via other protocols like cache: --- libavformat/file.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libavformat/file.c b/libavformat/file.c index 3ceddc8c25..1bd8b72d9a 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -91,6 +91,7 @@ typedef struct FileContext { const AVClass *class; + char *name; int fd; int trunc; int blocksize; @@ -117,23 +118,29 @@ static const AVOption pipe_options[] = { { NULL } }; +static const char *file_item_name(void *ctx) +{ + FileContext *c = ctx; + return c->name ? c->name : av_default_item_name(ctx); +} + static const AVClass file_class = { .class_name = "file", - .item_name = av_default_item_name, + .item_name = file_item_name, .option = file_options, .version = LIBAVUTIL_VERSION_INT, }; static const AVClass pipe_class = { .class_name = "pipe", - .item_name = av_default_item_name, + .item_name = file_item_name, .option = pipe_options, .version = LIBAVUTIL_VERSION_INT, }; static const AVClass fd_class = { .class_name = "fd", - .item_name = av_default_item_name, + .item_name = file_item_name, .option = pipe_options, .version = LIBAVUTIL_VERSION_INT, }; @@ -223,6 +230,7 @@ static int fd_dup(URLContext *h, int oldfd) static int file_close(URLContext *h) { FileContext *c = h->priv_data; + av_freep(&c->name); int ret = close(c->fd); return (ret == -1) ? AVERROR(errno) : 0; } @@ -290,6 +298,7 @@ static int file_open(URLContext *h, const char *filename, int flags) struct stat st; av_strstart(filename, "file:", &filename); + c->name = av_asprintf("file:%s", av_basename(filename)); if (flags & AVIO_FLAG_WRITE && flags & AVIO_FLAG_READ) { access = O_CREAT | O_RDWR; @@ -445,6 +454,7 @@ static int pipe_open(URLContext *h, const char *filename, int flags) char *final; if (c->fd < 0) { + c->name = av_strdup(filename); av_strstart(filename, "pipe:", &filename); if (!*filename) { @@ -507,6 +517,7 @@ static int fd_open(URLContext *h, const char *filename, int flags) return AVERROR(errno); h->is_streamed = !(S_ISREG(st.st_mode) || S_ISBLK(st.st_mode)); c->fd = fd_dup(h, c->fd); + c->name = av_strdup(filename); if (c->fd == -1) return AVERROR(errno); -- 2.52.0 From 05c3fc5150ba48d0d3d08f85e6966bfe2bb6d6b5 Mon Sep 17 00:00:00 2001 From: Niklas Haas <git(a)haasn.dev> Date: Sat, 31 Jan 2026 13:09:00 +0100 Subject: [PATCH 3/4] avformat/cache: use inner URL context name for logging Reflecting/forwarding the item name of the underlying protocol. --- libavformat/cache.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/libavformat/cache.c b/libavformat/cache.c index 0d682213d5..09c5161871 100644 --- a/libavformat/cache.c +++ b/libavformat/cache.c @@ -54,6 +54,7 @@ typedef struct CacheEntry { typedef struct CacheContext { AVClass *class; + char *name; int fd; char *filename; struct AVTreeNode *root; @@ -67,6 +68,12 @@ typedef struct CacheContext { int read_ahead_limit; } CacheContext; +static const char *cache_item_name(void *ptr) +{ + CacheContext *c = ptr; + return c->name ? c->name : av_default_item_name(ptr); +} + static int cmp(const void *key, const void *node) { return FFDIFFSIGN(*(const int64_t *)key, ((const CacheEntry *) node)->logical_pos); @@ -93,8 +100,13 @@ static int cache_open(URLContext *h, const char *arg, int flags, AVDictionary ** else c->filename = buffername; - return ffurl_open_whitelist(&c->inner, arg, flags, &h->interrupt_callback, - options, h->protocol_whitelist, h->protocol_blacklist, h); + ret = ffurl_open_whitelist(&c->inner, arg, flags, &h->interrupt_callback, + options, h->protocol_whitelist, h->protocol_blacklist, h); + if (ret < 0) + return ret; + + c->name = av_asprintf("cache:%s", ffurl_item_name(c->inner)); + return ret; } static int add_entry(URLContext *h, const unsigned char *buf, int size) @@ -314,6 +326,7 @@ static int cache_close(URLContext *h) ffurl_closep(&c->inner); av_tree_enumerate(c->root, NULL, NULL, enu_free); av_tree_destroy(c->root); + av_freep(&c->name); return 0; } @@ -328,7 +341,7 @@ static const AVOption options[] = { static const AVClass cache_context_class = { .class_name = "cache", - .item_name = av_default_item_name, + .item_name = cache_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, }; -- 2.52.0 From ec0a0f19717de4604878651569f8e6614eba7130 Mon Sep 17 00:00:00 2001 From: Niklas Haas <git(a)haasn.dev> Date: Sat, 31 Jan 2026 13:18:38 +0100 Subject: [PATCH 4/4] avformat/http: use basename of URL for logging This is not as verbose as printing the full URL every time, but still gives some context about which resource is being referred to. --- libavformat/http.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/libavformat/http.c b/libavformat/http.c index 6ee498b4df..e515ac04ec 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -71,6 +71,7 @@ typedef enum { typedef struct HTTPContext { const AVClass *class; + char *name; URLContext *hd; unsigned char buffer[BUFFER_SIZE], *buf_ptr, *buf_end; int line_count; @@ -743,6 +744,20 @@ fail: return ret; } +static char *uri_basename(const char *uri) +{ + /* Strip anything after a '?' or '#' */ + const char *end = uri + strcspn(uri, "?#"); + + /* Find the last '/' before that */ + const char *start = end; + while (start > uri && start[-1] != '/') + start--; + + const int len = end - start; + return len ? av_asprintf("http:%.*s", len, start) : av_strdup("http"); +} + static int http_open(URLContext *h, const char *uri, int flags, AVDictionary **options) { @@ -764,6 +779,10 @@ static int http_open(URLContext *h, const char *uri, int flags, if (!s->uri) return AVERROR(ENOMEM); + s->name = uri_basename(uri); + if (!s->name) + return AVERROR(ENOMEM); + if (options) av_dict_copy(&s->chained_options, *options, 0); @@ -1994,6 +2013,7 @@ static int http_close(URLContext *h) av_dict_free(&s->redirect_cache); av_freep(&s->new_location); av_freep(&s->uri); + av_freep(&s->name); return ret; } @@ -2084,10 +2104,16 @@ static int http_get_short_seek(URLContext *h) return ffurl_get_short_seek(s->hd); } +static const char *http_item_name(void *ctx) +{ + HTTPContext *s = ctx; + return s->name ? s->name : av_default_item_name(ctx); +} + #define HTTP_CLASS(flavor) \ static const AVClass flavor ## _context_class = { \ .class_name = # flavor, \ - .item_name = av_default_item_name, \ + .item_name = http_item_name, \ .option = options, \ .version = LIBAVUTIL_VERSION_INT, \ } -- 2.52.0

1 0

[PR] Add a friendly name to AVFormatContext (PR #21617)
by Niklas Haas 31 Jan '26

31 Jan '26

PR #21617 opened by Niklas Haas (haasn) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21617 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21617.patch This mirrors the design used to disambiguate log entries for AVFilterContext, by having `fftools/ffmpeg_demux.c` forward the demuxer instance name to the AVFormatContext. This includes the input format name (once known), mirroring the default log name; but with the extra input ID prefix. From ca456ed13765cab4a4f083f8416875678f138e8d Mon Sep 17 00:00:00 2001 From: Niklas Haas <git(a)haasn.dev> Date: Sat, 31 Jan 2026 11:50:34 +0100 Subject: [PATCH 1/2] avformat: add AVFormatContext.name Analog to AVFilterContext. May be used to set a custom logging name to disambiguate multiple AVFormatContext instances in the logs. --- doc/APIchanges | 3 +++ libavformat/avformat.c | 1 + libavformat/avformat.h | 5 +++++ libavformat/options.c | 3 ++- libavformat/version.h | 4 ++-- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index ee3167bb14..59655434a7 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2025-03-28 API changes, most recent first: +2026-02-xx - xxxxxxxxxx - lavf 62.9.100 - avformat.h + Add AVFormatContext.name. + 2026-01-xx - xxxxxxxxxx - lavu 60.24.100 - hwcontext_d3d11va.h Add BindFlags and MiscFlags to AVD3D11VADeviceContext diff --git a/libavformat/avformat.c b/libavformat/avformat.c index ee3f7ee1b2..806f8dcab2 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -190,6 +190,7 @@ void avformat_free_context(AVFormatContext *s) if (s->iformat) ff_flush_packet_queue(s); av_freep(&s->url); + av_freep(&s->name); av_free(s); } diff --git a/libavformat/avformat.h b/libavformat/avformat.h index bd34132e00..479f1f51c1 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1884,6 +1884,11 @@ typedef struct AVFormatContext { * @see skip_estimate_duration_from_pts */ int64_t duration_probesize; + + /** + * Name of this format context, only used for logging purposes. + */ + char *name; } AVFormatContext; /** diff --git a/libavformat/options.c b/libavformat/options.c index 28aa2da942..d08013bfd4 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -45,7 +45,8 @@ FF_ENABLE_DEPRECATION_WARNINGS static const char* format_to_name(void* ptr) { AVFormatContext* fc = (AVFormatContext*) ptr; - if(fc->iformat) return fc->iformat->name; + if (fc->name) return fc->name; + else if(fc->iformat) return fc->iformat->name; else if(fc->oformat) return fc->oformat->name; else return fc->av_class->class_name; } diff --git a/libavformat/version.h b/libavformat/version.h index 1d3a53875a..1b079ebce8 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,8 +31,8 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 8 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MINOR 9 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ -- 2.52.0 From 565ebade18c4b132e117e86d85f51f6881432c83 Mon Sep 17 00:00:00 2001 From: Niklas Haas <git(a)haasn.dev> Date: Sat, 31 Jan 2026 12:00:36 +0100 Subject: [PATCH 2/2] fftools/ffmpeg_demux: mirror DemuxStream name to AVFormatContext Results in basically the same name, except less ambiguous because it includes the input index. --- fftools/ffmpeg_demux.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 701f9ddc34..c8d8a7e044 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1879,6 +1879,7 @@ int ifile_open(const OptionsContext *o, const char *filename, Scheduler *sch) ic = avformat_alloc_context(); if (!ic) return AVERROR(ENOMEM); + ic->name = av_strdup(d->log_name); if (o->audio_sample_rate.nb_opt) { av_dict_set_int(&o->g->format_opts, "sample_rate", o->audio_sample_rate.opt[o->audio_sample_rate.nb_opt - 1].u.i, 0); } @@ -1967,6 +1968,8 @@ int ifile_open(const OptionsContext *o, const char *filename, Scheduler *sch) av_strlcat(d->log_name, "/", sizeof(d->log_name)); av_strlcat(d->log_name, ic->iformat->name, sizeof(d->log_name)); + av_freep(&ic->name); + ic->name = av_strdup(d->log_name); if (scan_all_pmts_set) av_dict_set(&o->g->format_opts, "scan_all_pmts", NULL, AV_DICT_MATCH_CASE); -- 2.52.0

1 0