From patchwork Sun Aug 22 00:47:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29711 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp652873ybj; Sat, 21 Aug 2021 17:48:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAZzeGadQg+U8cpDz6T4jIj2KEttlPdfD0Oc3QcG4ogbtlRFiSMfNpHz0gk3sV6qwmJ2eV X-Received: by 2002:a50:99cc:: with SMTP id n12mr29737778edb.53.1629593322763; Sat, 21 Aug 2021 17:48:42 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i12si10207199edu.543.2021.08.21.17.48.42; Sat, 21 Aug 2021 17:48:42 -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=@outlook.com header.s=selector1 header.b=ulz1bIuc; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81AFE68078F; Sun, 22 Aug 2021 03:48:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [40.92.75.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 881BA68078F for ; Sun, 22 Aug 2021 03:48:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mFON1BoKcgaBojZ0RuXUfwVdgG0OfN6GVuidTpplBpsV3cLN+XKKXbGNrUcviLhd040adyxd8LTs3HkzVhEFNT59nSqt2jOIJSqCbFCFb1sJg7wypD+M5vh6tiZ0iNJ2OUHkHPEgggJ7TOQpUu5z4D3u9aCXWo0Tnx1vE2oCxySTi7UNZHdddroglcbB9F3JGWWIpMbzlKdqCcVLW/CFNuyVTVMf6QfaSKhhAGz40Ui5bt6TJVcImrx5s5XD/VfETHUbhn7lmEo30WuVU/c2bwGM0DIpp7oCz2zhgZ1VmuV+FPX/QTMjng3ZA1ufMUJcCPxFFacvg28ktw2c9W+Pbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zN+dQce9kkM7vem70MwO3xfhJXLU7qz3UACewxYG9tw=; b=PWPbslcQU6O4iVODMKn5Mq7jnx9CxdGefoEMgC/l5ZlKg5zw5fDgfnOGWKRwdiCDAMaPEamPLCYH824AgmPY8ziX/9GfiFMAMgDywvur6dAlm6Qt3RJEsg+I8dt97HXk4tN8BR6Nl/Uk/q6DSXwEbtAVOQORibptFkOHQHKsqjz5FC5qFpxIDMgpewYjUZr1xZoWZXEnXecDE8B7XZExWJjaWzdgDgn1+hnvApVrK0YTTvKS9+iDujC6bumJPofU1CJcUbuXfVPeI+l/m/YtJgK4FJEu2TKP8IPVSSnFWRv5K5KxlqrlV/e4iNo1LZBNIjL3gZ5OEaksPli15+/TOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zN+dQce9kkM7vem70MwO3xfhJXLU7qz3UACewxYG9tw=; b=ulz1bIuc9jvBR+TmSWWrs5m43+6bUnSD/i2vtINUkD3oW6Gq+YQtTRoiC3QK8SyaZpH10zX8DT32ghDnmZ3QA4q914m+qB4DOP/sO78F/zvD8hl1G66htQiXLEzA9WnuJlV9SI4H5g79qqDMho3cKJ0rv9XBxoLrPHJJA01YAJHEEaEWYiHUIkFDbMqVvRzxCDNTV0duj7FydKZWTCqPudNJLcBQkXX1snnX6HWX4l7PKcm7tLc8GD7cc5PgWi38PjaOS6gr0N3HF5Q9JKicH/TploWGZHbdwwCI0VkTcYktW+yodPKHyVrbl+V1XfdyKI0vsWoN+7C3tG4jRH1QYQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6862.eurprd03.prod.outlook.com (2603:10a6:102:e0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19; Sun, 22 Aug 2021 00:48:06 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4436.023; Sun, 22 Aug 2021 00:48:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:34 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [LmQTmi4UQB0HGwIDQcj4aJjfD+M6prPI] X-ClientProxiedBy: AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210822004754.1341756-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0902CA0006.eurprd09.prod.outlook.com (2603:10a6:200:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.18 via Frontend Transport; Sun, 22 Aug 2021 00:48:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa42406c-5af5-4bf9-facb-08d965068169 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyEmRrECDLydhKoAsVaS4MovtqUmA1sBoaDJbw+k/f6wP1jGZ7nEaQoWfoapeb0zCUaSScvSE2hBadRiSHPwFChupNKcxxs1qlD127xwFIUtvyGPIoN24a9/v+Oz5/l7gdISioPfZVXuPQrbhf/E5I0DeD0Q/mdBSUBMiLC0uTi9rT7JAHEFynx2nDB5O3QsAiNBwCP/9hEs3cES9tg4Q9qIbws0tVEgE3QiJMkp/W8H0yboCEuyCqXfhrP29imc3dHSL3pwVNKOjCyylMTDqZMNh88qcamLiRnpsqAqOb7a1fM8QKqY7Blt6NnfpVJf3LaWGpB1PGF+lLgmHjCkkVw7Kea3AwU2dmjMq0VS8yNO8afAPR5OMf9qp5oHaB684ThXvjyfvS8+u7ttAAtrpVbxkwEh9XjelsYJXwO6lUhPfIUmRtBq7xldalVWkG1Y+alAdwmX80/xQ29HBRmWlZFfkndhri1umaOqmGzZRL4xUuduib0TANugv50LcRqWak/iMX3Cx1XEpZoUWz03gg1l2/X9sDHhWYfSiIoeb3mmD2eu4y3LdeIjllKu3bnSHs5g9rYOictrmQ2a4KfNRfEQLtdI2+WJcNwtPie+WNZ9bth4ZtbwjRRRvY+PT/4LgFPkz6LSxj6ck5V9ycSBulli+LJzD6xaGD7mpSkOsMd18tq3IDKWw3YtKOaqoV2PlgGdn/xt1DoEflfwmAuTQAXfbLzakrS2QBnCyvNCQUnTA= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jxxw+uibD1x2JVhEGKGet0dfpZImonG8pndZPDWRt6Bp3rma4OB4B4G4XuBuuJd42lRiMkj4sOxKpx5mxgN5U5Mc7Av9fQTSZDym+mI8Om+XLFPMC8cMPrxHTmPQXpLeS0adDMYGZnfqdeW0jwziVv0A1ju40uo2Zrh+0SmzREFBXa5gTfkLoFlPSXTTAuvQkR0q/Sg8eNWRmaFek8ve7YScCiFtNJKWHjrdtHC73dJyQf+3k7mpeA7IG9ThxhehPYR4hkEZO/tAboaLrUvh9ktpV7XyODm0eSrEsIprv8xv9BVPWAUiOgXinCeCr4aaTF2i8hBUfPhirDiE1iz4BFIAFhY7T+WrHtC773zDnl6REbGn2N+Z/zyeo4pQprWAOe86JVo0T6fX5hYoonzG6MhDfA/v4M8RyTQrDk06wE1HnnbXdsyMmkYW0x0I5lkp X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BJjYjMjpsZFou39uCk+xDjOskgzG129o9fXnLhMA5YTgqRcsfXEC8FjJZLLfkTOH4j+ZunZkcqDd/8kUXWgKkEyLjkjaEiDIVHFEekMC4YqZcHUVszWK6iJU1fL0+bw9YFidIT7KAlIc5aQOGi3mvQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa42406c-5af5-4bf9-facb-08d965068169 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2021 00:48:06.7052 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6862 Subject: [FFmpeg-devel] [PATCH v3 05/25] avfilter/af_amerge: Free inpads' names generically 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kbFdNuwqrPBD Content-Length: 1203 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_amerge.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 0e8bdea436..d67e3d7e32 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -60,8 +60,6 @@ static av_cold void uninit(AVFilterContext *ctx) AMergeContext *s = ctx->priv; av_freep(&s->in); - for (unsigned i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static int query_formats(AVFilterContext *ctx) @@ -328,10 +326,8 @@ static av_cold int init(AVFilterContext *ctx) }; if (!name) return AVERROR(ENOMEM); - if ((ret = ff_append_inpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) return ret; - } } return 0; }