[FFmpeg-devel] [PATCH] libavfilter/af_join - Free memory if using custom channel layout (PR #20914)

[colekas via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

PR #20914 opened by colekas
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20914
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20914.patch


>From a81dd03e1d494911f30a67609d6c848a40dd25c7 Mon Sep 17 00:00:00 2001
From: Chris Olekas <chris.olekas@ssimwave.com>
Date: Wed, 20 Aug 2025 11:03:30 -0400
Subject: [PATCH 1/2] libavfilter/af_join - Free memory when using custom
 channel ordering

---
 libavfilter/af_join.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index de13f8f2dc..a63cf409f9 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -195,7 +195,9 @@ static av_cold void join_uninit(AVFilterContext *ctx)
     for (i = 0; i < s->inputs && s->input_frames; i++) {
         av_frame_free(&s->input_frames[i]);
     }
-
+    if (s->ch_layout.u.map && (s->ch_layout.order == AV_CHANNEL_ORDER_CUSTOM)) {
+        av_freep(&s->ch_layout.u.map);
+    }
     av_freep(&s->channels);
     av_freep(&s->buffers);
     av_freep(&s->input_frames);
-- 
2.49.1


>From 8662a741d2620bbd8e749628f78feb147d97a36a Mon Sep 17 00:00:00 2001
From: Christopher Olekas <chris.olekas@ssimwave.com>
Date: Thu, 13 Nov 2025 15:05:28 -0500
Subject: [PATCH 2/2] Use av_channel_layout_uninit instead of custom call

---
 libavfilter/af_join.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index a63cf409f9..c2aa3d6330 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -195,9 +195,8 @@ static av_cold void join_uninit(AVFilterContext *ctx)
     for (i = 0; i < s->inputs && s->input_frames; i++) {
         av_frame_free(&s->input_frames[i]);
     }
-    if (s->ch_layout.u.map && (s->ch_layout.order == AV_CHANNEL_ORDER_CUSTOM)) {
-        av_freep(&s->ch_layout.u.map);
-    }
+
+    av_channel_layout_uninit(&s->ch_layout);
     av_freep(&s->channels);
     av_freep(&s->buffers);
     av_freep(&s->input_frames);
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org