From patchwork Sun Aug 22 00:47:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29703 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653241ybj; Sat, 21 Aug 2021 17:49:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpREJJda/vY4eqMz6Teqag7xONubI6AA+TU/XAxLsZkmZXQ93xaLG2ExPWGw3YYXH2fc80 X-Received: by 2002:a17:907:1b29:: with SMTP id mp41mr29173080ejc.459.1629593373486; Sat, 21 Aug 2021 17:49:33 -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 t22si10849870ejy.236.2021.08.21.17.49.33; Sat, 21 Aug 2021 17:49:33 -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=J62ncopp; 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 325B768A4A8; Sun, 22 Aug 2021 03:48:27 +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.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4041268A2D2 for ; Sun, 22 Aug 2021 03:48:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=foMiTTbJEX7qtUFBx37iC9LGeh19OurfS+rbph3DSzIawKDo3qS5X8uKzdyRaaVuPkXv3fkpC6d8n7Nfsf8JghrUklxkQQPahu4lXmzYjNdqWPfcK3299bK+Q6zrnk7XbdhiaHnXgi993eupPee1L6S1OkziIqzSiPf2aXTXDzd/cyRFmX5zqG30Yd0b0+rvE3eu2cdF71wLmcIh6/EvVvDBdNMTcE+4GHezxH1N3P+qNgeG/7REbvTFmWu/XxkktFg0lsTQ4EQheWIqDAMzFe0VFM6jcnp97JBMPtJ2a4JEprWt3x215cUrHs3tKjV/HRNi9TCjIEC8eGrikeRLLw== 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=sNql+QFcIDLVOZiZ68nBnRfCpBGpNMqbtzggUWkMItw=; b=SXvVPgg6ud9Szm9EstniGPbXkgMkKj8uEMHn/0HXu2NSYs8tMxy4pr26QLAWPOuuiNdzK/+X3bd+8y+SkPLGyVVilTbUzAKZaHI4f440V4Ic8z968uZtNvKNDFs2yHCEBzS91HpUEuXAmI/ZJ+sXJGfjCL1EyMdrvfX+POHx6uod+UU4tEkcAVWc7pwPay2zbe8YYPmq2ykReGPpmc1vhZKTEJhjvy8rdkczOHbOwqU22uMQl9+hRscZpLgEEvvXTl99yqdM5sL+3iYd1JDCXhOYXConDHYSvr8sbcE7/tE8MNh1rQ6eq/I6hAWfAXNNNzh0B524YGSz8uoZsjelWA== 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=sNql+QFcIDLVOZiZ68nBnRfCpBGpNMqbtzggUWkMItw=; b=J62ncoppEoX17BRoD+eiXGTBOsgHzdvgFujfCLwUfO2SS500RBvWiHX7zrzTe6cl2wttK7TNiF+mlsqbWm7cfQf3RNdBHGCluWwE0m7oUqjG2I6P2JpfYWZgZK2w3AD876BVOkDPpab+QhBlUL7Zi6PeeRAYY8wjgbBud6lnFkBPbPSUcbnaHIHmUY3LF8qI4U+lSbNocsV9mqIvVVjjDk0r0v5NU/BdHVROCgNhdATPat28PieTrirKEd7Maydq1kcs1iw5xOTaIlw9ag6L0UfNeUifFP/e7mdrHo8BUabAKLt+LSG2/PHPXEdJ8OSGPihjRQf1MpVPwne/YedvYA== 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:11 +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:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:40 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [wpf25QcoW8ONB5QUxmTFXu8vfPTGjFP5] 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-10-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:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9781b585-9c8a-4a64-91ed-08d965068480 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyEmRrECDLydhKoAsVaS4MorYh8kuCA2WAXyHPjnAeUH1nTLnqtfygpkgygyP3ooQs59RJMfoYKkOzvSfU/lbk8+43WhSrIQwe7417PM7SDJ7UVX4RczwlPX6DQoBaljPu7IEjtfx9dF4Gn0JdgMmUwB505IorUI4crv7vsQQ0rZybhBc/5VMFrbZWClj2ySmiQHRKxzj9WT4DMBrBm/xpPA8LgB86aO7tVd7kp8maG1aONimvumjHWYMGYEv2W8vkKiKMwfe4LiKlHheHX8YQkMSC4SvkBvNbJifC9LEg+/FXSzEWtUT0i//8yeqzGKA87/nzghdM/Zj9lNk6CyIRKKPjtxXoYx32ohL90PCJaGqO9CkAKlyXM7rOcJcZksGee0oE1X/7X0krEKlomv40k6PJyLzZMY9CxhE9dquMqMzPjN7jI1fn4B7ezvM34LJIe90J9b9QY2Z4IL96ILaOkqewx9CT0/ViMwvAnewy/kL08yt8lvc8PFFFC+T7gUcv3ho//VAVTRFJEjeuE2kxVf3s9HFEdX6kgFdBcGo5zZv4CK7fdvOehfznqsIBygUlwEiBiwEBuSXiYiHCfjyC9LvHiHNUAGBUtVoYor1C/HfIU0cog2gF4MqdabLncuugAIg2C2qxHhYoWlR9DaV+txvckIiMG1PpYly+twd6ptAXaE9R4Pdz9unEtw93eZ8c0RX8QmS9F3uv41mLNMo0w/bUUwJYy/U1kIEFipySywY= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ud+/urFPZ9Ifh5eyKgeMn1lAIpq5+Tf3JG62747SdSxngefg+rEcJQmAyHMqx/rRR7GP5VqFkIbasQvNfmaR+hjawyclLDA8v5rWjwXTqF48/HyaJaTHF6IEUrqcCz74NaS1ZVSIiBX0KkjByWUammUX20Gsnj7WE5doxNlRnNNB+z47b9HR0nRIF1OOBcfZ1FCnV2IV57L7Um3B6sq2jkpq6X+K43r4X2f9/KHCcDkE7D8q2F3m6LyZv7+5GMCl71H//caGd2KG2Ox3yxAI3G+xkLOJVuzFu+KVWg4nsUtzz+XxQrrpZFGqZaxyEwRdQK1O25TmqwIXuTNO/TmuYrwf+m/puFfWEY2S61f1r2pWGO4dT8TZ4dZjLL6vVyBPFO7FFz76uyXWdj0n+EGXPZMY7wxmPzfnEYl+we+Dx7EXXHtbOwE5rXEAqKJnKjzN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9i/INbPgoYX5B8oGvqW2gL4TmA23m6rKchkUmMiuG65F9QAUs3OlNPln2C96oRqLl1o0mZHKpeSUaprME5a1fKSXd7c6YLz0ghh/iF5oc8KHSOP6m+x8MSNZxr7rh3skEC7HxfjB4hpwCZT/HbHtHQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9781b585-9c8a-4a64-91ed-08d965068480 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:11.8675 (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 11/25] avfilter/avf_concat: Free pads' 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: pca/9mkrIQxo Content-Length: 1891 Signed-off-by: Andreas Rheinhardt --- libavfilter/avf_concat.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 10f21cecb7..2ae24e9b39 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -319,10 +319,8 @@ static av_cold int init(AVFilterContext *ctx) else pad.get_buffer.audio = get_audio_buffer; pad.name = av_asprintf("in%d:%c%d", seg, "va"[type], str); - if ((ret = ff_append_inpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_inpad_free_name(ctx, &pad)) < 0) return ret; - } } } } @@ -334,10 +332,8 @@ static av_cold int init(AVFilterContext *ctx) .config_props = config_output, }; pad.name = av_asprintf("out:%c%d", "va"[type], str); - if ((ret = ff_append_outpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_outpad_free_name(ctx, &pad)) < 0) return ret; - } } } @@ -351,12 +347,7 @@ static av_cold int init(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx) { ConcatContext *cat = ctx->priv; - unsigned i; - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); - for (i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); av_freep(&cat->in); }