From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id A32774D230 for ; Thu, 13 Nov 2025 20:07:16 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'ySVw5rQ37QVwfnyJENBHC4v8UNdLEei+pCeL4OQlxl4=', expected b'9po8bkF0OrUm+i0rFj4stv5t/fmzlQpleRSvQ2gz44o=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1763064430; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=ySVw5rQ37QVwfnyJENBHC4v8UNdLEei+pCeL4OQlxl4=; b=4k6N0hUcXIZu23DibHgqDpveKaar+u4vhvfNUUyHmtwcnvfoS5lmA3ZklnwLWiQtvLMbc kSC3kuFCPUvkcRKW8YtsGsBzJkPURxq86L1uVF/rPJYlF2nuY1vOjJXHxFxdfT1jplPEBv1 VcTcEp4DgIjeGn0Z0y9sTe5ftRYmOJpmbjXl6KeJArI9cJ7RzzJHHvO/5u4OMiisO/iZq1s 2b8XJEXhH64WoPlj+POFofHAmAyRbxbeEl4hiPUXT6iYQQzWt1XnZiGcdPimypD9CbTFWkA Fv2dKP3nIjFZBdq8lvazME2nGUo76pVdT8sGQeFIk1kSyotGQ6QqmgJ5BrOQ== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 3119E68FD95; Thu, 13 Nov 2025 22:07:10 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1763064418; b=aU17zMJayJRaPHRsCJE1YZCHOgiWLY1nJBOQ0AxYUoWPEg4X044wp9Z4I6y4jZb4RXOMD fx/zrHgmP6SJyJsRkKP+bJXUMR0852XpEycIdOMqwOyEvcvAHB57TfhrhqqwNn1gRnvkXC6 q6qWlU39wL2kIksZr9ccR/lSRL0jxsDQ3ESis5eMsmehWEcHxbvIebBuSh7R8JXbmR9cLIB si1+Kev1jGIdO/z+nUOG3p0CmQOSPKoTkOn5CTYZo55XyIqz2tJHrstuIMx2ISeq7QRVhhZ CysMfHFOlGrmToFVKAJy+SCz4AGIWjjc2tNg7qmgJPtLGXv2qE6NEmuR4H/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1763064418; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=WKJkWNMGbAx7kGMeHAqZMhXFPPvB4RjczqJUyge3p68=; b=iXc++nVvd71bSH4TPYBscse9DHR40AHVPx/q1TKxnNsu/acB/yVHP4gJujNbuFVvUApM3 XwkwYKO3HXcfwdQzZ784akZJ3m44izQ7gGUKyNoj77E35pcrbJFDDuzxVSubwerJSRc8oJn 3dglf5sScNRHQVfRX4/rVFp2UxO1GqaPTQE40/IUQOJ5CO1DERosbERQY+pH94JTejHOByi 3HI8LeDYWm6/zhPK21v6aOKZGSZqkDr8jeroUGQiAVYqd4u0Hn5m28tx5ONXLiUy1iZkULq xI4zienrLuTZrJJjoRENEeX2pTTo8p5LuenWhjsK0IUMiE4AKwSB4xh4ppRw== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1763064411; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=9po8bkF0OrUm+i0rFj4stv5t/fmzlQpleRSvQ2gz44o=; b=xxdDVIp9AH6Arvj08dGbUBgA9pcnd5Uh8L7QCkv3Dwj/VzQrX3MiDyWSsoOjIUlp2jdz8 Hz/JTbXRYvUDGYryQwPPNGRtY6KZXbxqtXf9IJLoDUk6VhXa7NFhP1HIotu9fYIkoRelsDD FJb6yfE2dWueSjBjEgakVUvUjzgtlkufbXjbKP4oEyMBlqoRZ8hrpBjSgCCgrqekxUsYS2i hluFqmQOz8CM2lDL/m5jcLrCoXsAmLZhfiHIKvpBDmwk/8t4KHHwWEDH4W/jlrAiMk4JQW3 Xv0V0snuok/6BCuS3j8dbtF4JR5l4T0GQCfxlRgyV6IbF+iVd81tgoANd2wA== Received: from 188d6d40ca7a (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 7DDA268FD69 for ; Thu, 13 Nov 2025 22:06:51 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Nov 2025 20:06:51 -0000 Message-ID: <176306441171.25.13579979297151613330@2cb04c0e5124> Message-ID-Hash: HZYLYWXPOC3YCMPHNMYBHOVGSZAIXPMF X-Message-ID-Hash: HZYLYWXPOC3YCMPHNMYBHOVGSZAIXPMF X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] libavfilter/af_join - Free memory if using custom channel layout (PR #20914) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: colekas via ffmpeg-devel Cc: colekas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: 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 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 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