From patchwork Wed Sep 11 17:40:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 51510 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:14c:b0:48e:c0f8:d0de with SMTP id h12csp473853vqi; Wed, 11 Sep 2024 10:59:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXr56KmaYrN9+91DoBMV48jdri1nBYYzTLg0g43KooRM4XePIj6fPg2V2RSx1u1hPPL02hIg5lvxq6gY97t0LsV@gmail.com X-Google-Smtp-Source: AGHT+IG4Q3iwmmOis/3fpAYkzEvK/2oQuQcv/PkvyN1KtfSYyR/RzmsGc3x2TSe/BckCwLgRRePH X-Received: by 2002:a05:651c:881:b0:2ef:5d1d:e68c with SMTP id 38308e7fff4ca-2f7749ea04fmr26451391fa.13.1726077550883; Wed, 11 Sep 2024 10:59:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726077550; cv=none; d=google.com; s=arc-20240605; b=jTyaUFeXw7NAsEX0jVrJ6UjzTyb9N1rxKCB2Cws19sQjkZxW+iIfId6kplcEPPrlSv x/PLgxEZSeX+T+7Mys8/+vwujnW1TkXYGYXs7m2pIABFrkJ+/U4GcXTwiwoNJOHVwZ4e 0y7ZIiqL34DON/fSaooMJIKv8KXAhoY6XVxI2Lo5YAxbPBqrqewcx3B6nzUJwEaYvWDj jHFU5/jMTS/MzcRKJH1ePG3APx0/8QdpIQvOgvFms+7YZXTeMAqlrmwTi1Q6MhXU+v0j Xd5d7Y5DvR71ZLovcBgKouH5yG8NrS2MnhMxBHVoA8iNEG28mWiIkpdieQhfk5tRe+Ew bJQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=EdBlYgk24XI2Vmwg9UfBwg4pv/HqQnj+glUlzSLkjwQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Y/K6nZIQVWwSwwTq498L3+0o55x/wd2ANtZnX44Tgm9xE+Ui83x+U5Ux8sXoWWaNba 7n4E+ZTu+we1ZmIR0ta8yYjgddS5zOxoBvxLAqw11RtDUg/PaKUS/8NxiOt9BR80tjNc ov5y4g3ggqPilBpqNV5fQjYSivgAf2CLgrlnQljalOaKDJO5wj+hZLonc1KS8e7uEVgr YuHPJ7uSqsTQslqa0PGe5Ylw70KedxPKr9xdZaxjwU/G284ksWIk1OUIiu+GE+6pX1hG eT7sWVlPcfZKXEGmL8GbQ8iunP9NltGIzxPDQphDXkk/VzZucRicOdt2i/aVY2MpuZgR RnHA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=TaF41UmY; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2f75c0872d4si29226001fa.417.2024.09.11.10.59.10; Wed, 11 Sep 2024 10:59:10 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=TaF41UmY; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E9E668E227; Wed, 11 Sep 2024 20:40:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2ED768E237 for ; Wed, 11 Sep 2024 20:40:12 +0300 (EEST) Received: by mail-oi1-f181.google.com with SMTP id 5614622812f47-3e04b7b3c6dso38081b6e.2 for ; Wed, 11 Sep 2024 10:40:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726076410; x=1726681210; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=T7vri/dsGkQUfI5t6TdfAjXBl49sCANQSnxJn+l4M8E=; b=TaF41UmYYnzS3Bv/bnvksYeEpJBAECKXLofe6dvLsdrrd7Tm7os11U+16MUP14b1gA b5LIAxAAG5XjSGMuYX26yp1ICQWUhKRpHBSko++QXAfCDQ9ok+eDJMQ8/lk5jPZlWNbZ Pt8MU3TFzhuabtQfJ7dF8xquauAcsBfOPM/oZlPiUxaGfnzVyI2rUmJzKk8BLyczg8YQ 6e+QhDJjC0Ln3m/0X/Fowxc8I+COPYi2S9TYvV4jDqgGXabmaCBAc79sgTW6+eEoftT6 2/sSGWH5OMKkagqqOhgt8pQ9JWniVs2m+mp79TX1hA1eB6zodvJvVbcZZfYkFGxw0l7b 9LAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726076410; x=1726681210; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=T7vri/dsGkQUfI5t6TdfAjXBl49sCANQSnxJn+l4M8E=; b=mGjU0UJKA7f5Tly2+LzM0VsB+06LMwICj0ZpXpgKVBku/mTzujvX+18xottjLfOvbu 6cNkx8VC5YAwBNqGx4E2e7/Q1uPD34q9ZgrvTrbxpB+jQnYDMxQ6lp7aQmraivmzpX7e 3H4gYVPjjurA9ONB8geGzhTeZIFwYtMJ3wLDLeCiko6wuvQijYpPbz/LayBIljOW3pmW nVAgg2dcNF93KV6z07QWRn5Qidfjv9LuCCGIA5t4U66y5vYOOF8h8zyl7DzrMMRxU42+ iIBNwxM86i+dogdXZtslKYnvGEA1Xla7ed5plSirJ++b6c5S7EagIGEim4ctlx1iui0o rnkg== X-Gm-Message-State: AOJu0YyJoE7fIShcHCsdGaMZXldv2YOQ8wHGyNGDebXZgYw538CFlWMo F1S6Z2j4XRq9Ajlg36k1Q5HTnTLU96Ga139i0uN8wX15TcBxG7c944EYSg== X-Received: by 2002:a05:6808:2e47:b0:3db:251b:c16 with SMTP id 5614622812f47-3e071b23d29mr59149b6e.42.1726076410234; Wed, 11 Sep 2024 10:40:10 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7db1fdee186sm241821a12.85.2024.09.11.10.40.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 10:40:09 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Sep 2024 14:40:09 -0300 Message-ID: <20240911174009.4709-1-jamrial@gmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/af_join: pass the correct input layouts to ff_channel_layouts_ref X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0VzsEwz+bsw+ Should fix memory leaks show in fate-filter-join and fate-filter-crazychannels. Signed-off-by: James Almer --- libavfilter/af_join.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index db0320aa70..0ea53248b6 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -215,7 +215,7 @@ static int join_query_formats(const AVFilterContext *ctx, for (i = 0; i < ctx->nb_inputs; i++) { layouts = ff_all_channel_layouts(); - if ((ret = ff_channel_layouts_ref(layouts, &cfg_in[0]->channel_layouts)) < 0) + if ((ret = ff_channel_layouts_ref(layouts, &cfg_in[i]->channel_layouts)) < 0) return ret; }