From patchwork Sun Aug 22 00:47:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29699 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp653644ybj; Sat, 21 Aug 2021 17:50:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0ShMn/uf6sbmo2yf6ntUc/uqQJgpHWNwh78Jg9MGsKxDJ1VEBgp0Yymdre5O2b/l6ApHg X-Received: by 2002:a05:6402:1d33:: with SMTP id dh19mr30125504edb.10.1629593423276; Sat, 21 Aug 2021 17:50:23 -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 w3si10402395ejv.301.2021.08.21.17.50.23; Sat, 21 Aug 2021 17:50:23 -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=WJvXGauP; 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 AFA4968A5AE; Sun, 22 Aug 2021 03:48:31 +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.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 765E668A2DE 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=keds2OAw99cvov80EPNKVPZihTNtG+A+F4cWTKmVEF7vphqu2RNlEizKkj2tfc5IuFaU+PhiZVzDARf0M8Z6advoU92suklwyPV+e2MoMFd/TCUGFKRkSibzpk0p6WtpXmwJ8x9nrzXTW8mxlngIHJ7i8TRUKRrtiF3iE2yKISG08O6213Bs18Lh2QiH2oh4Bih9o6pGlL5ksVJW+IwuJ8B1mFVcpsrFQmP1yhsJb124zSBfDhrk8h4od1dw9DxhUSmed/RECmIKddnGl4nIN61WEsNT3eFO9ZQtlp3dQCuXew0VLOK8IHDR64aGH4e/qhUCuxj9KA5QvK/+pUhdYg== 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=NsRMwhHol1k+tlDrOF/1SwFw+TXiznSvgJ9g7MNIZGs=; b=Xo5o8kQ9rEAm8jafLgiI4SSx2D1UQVaQrVcY6nBZIkpnwEULm4PtYGdAOTG4DCJsiSRxOocnV8Buzti2+Y4oc1u9mTQj8oqTjM4U9QvZToO63NXYioEeLDBAzq8ctYTYlc0wvX59X0RzNQc4zYMrE6F3FLtpXXMU/D6qhhs8RrxC5cLLhplEpxkAkzxpiZ8IFinBGk7QEodc+AWjS9ZEf+sdg1oDxoUEbx3/7/wxqF6Ksn7SIaUswkO782d1f30/D3Lh9JJOi/V8Pg0tGy+8l8qZo8Ob6ZWc+/kadq1Xqo0lUF7O3s36wiMNOe5KfmGkN+VS2iYfbB8Xxie5+CSzGA== 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=NsRMwhHol1k+tlDrOF/1SwFw+TXiznSvgJ9g7MNIZGs=; b=WJvXGauPkPjtAwAu00JzW+8N6/l6abMUf9f0oEsjYSwSG4HAZyh0L3GlhCXTiSc8t0LkyzUNymCmLouwdG+PuKyrFuCHYKKLT27wHM5LqNUAaXy4zbif4kCjX69GemPLRqfyLIkOKFd/kEHxRxmK94fXT5eEO4eG3Qwk93R5I3bGyTOLZktTyEhvDRXmANbYjyOiOURvNEogYI2E3VO8gnPrGiicEJiXSjXrCZC3/Z5v+xV+/U9LnZIyfP58IJ3W+KtgN2hjv+yarMFGJ8FHNmxhfa8AatdEW20296zqeYan5e8UVGR+Y6D8EB2W5KslitGrnGlQC10GT4NRe2CTzg== 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:16 +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:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [yOukxxyqsI9/HBaLywz4GbQzI1b+QiVu] 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-15-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:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d5e45352-8af5-4a55-afab-08d965068712 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT83tPMj9nze4Xg6Ue9mZjyUC3HGLrUc0AuOPyQyhvXJjqV5AgcUQlLQu7xVsJ6pSyxUyoRc1bKV1bjz83qVjrqPdxQPrT2JyHHujouMbkk6QUumz3+tISJn+AErbx+HTi1drTa59UUIpZPwxmLOooFRHk5nji/v9ElvBuBpk88785qcI4iC2sv7Hn4gmVMWkHv5I9uts4r8PmStPJ5KxtRpbv2kvGtb7RhMy/GFnHXPwUtqBNxZtwX3KK9kzNBVDmYDzNCzjTnletQGoFGaUDyHKf6+oPg/VWFgYTT7nplOEm0hifrosgXviTEtYux0oAyApmne0TOP36saHheCp7UyMXMWUFlfgdz2z8QgfFEKPzvl5L9z3AnSSztJqdn+OlagY5DaHdXg5n4dSWV4jhnPJlqQi94Ml1vbMSVZkhUmMg9IIRjGyBitLBR42M2Vddx52fiQKcW0JKvXriCSU5as9YnmK9LMvC6BH85oqvYdxo7WnMqoMvmxhxb49ubeBIR+K+GAOWC0j0b8evS3iLRTVGCnrjcCsAV1f5iOf3/rPtKPOwGHk1egUdkzraKhgIG5OtULsQ0FmzF6U0Ilgv1WuMF9rvWX2IgozLbjUZXp/ygOHFPhRqnIJ4XXDNu7QpJLjeL8zAIQydKUWm5mvomoYT1uITfVQThcpTQWy+Ek86Iz8olff7ZMj9oJVDtvpyvuZmyMrNjOl9ANotdGg/+Ay4kTTMLY22aWjvki8dD5gkbcXdt8iLSQ0OsCTjBlqc= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V8d5w8vaQnGah2V4Ki+R00zWsqAmi9K+AE/8jlFynJ1BilDaJs3khj+8TLscUkedoFbNkyh/eyY4qF6wrhsmfE7ShMmN4A5hHoZeDo1zvTGSTkHbOYutZMeUhuRdI8XUXX8a0ZQrAUyzyk5zP34E+vbfIfclIKF2qlK1767dXUMNumk3Xqjrpoi3ggP4RKNof7hLZFuRChb5WMUTOjPbPFaZiAH0tejvAouRf0ZP3m3ExaI/OFrze4nRBU9X2WzKLe7OpAVHIShfIKg+XoV3Uj7ZhCGsNV8mbbuOGhr6RU324JgblfqesTtwHvTjOdHILjBNcK0WyRCmD/DyzKk4ow0AHvoaBNrhgO1dVNM0QPaDPA7M71/Fps+5hv24XVMgWN+l5Vr3doyXC1abo4k+WkTsKzO5XrF6cduPH/bzsdD5X4BLrEG6hAGH2ghaRLyb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hOXkquY3rZwqAqZ/2Ko7zsYson1WuTXQNQGGfSlNL9f1YYqcpioxE7/eXlRSzKrRqyV/ML0FgPeX39WEiDMlFMuFLrOrnlQsz/ZqZpCSfW8NLj+Cq1bt53w/LtKvkXa9wHWhxJb5W0j17eZsmHMMOQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d5e45352-8af5-4a55-afab-08d965068712 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:16.2184 (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 16/25] avfilter/split: Free outpads' 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: JoJuTP3gY2rC Content-Length: 1831 Signed-off-by: Andreas Rheinhardt --- libavfilter/split.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/libavfilter/split.c b/libavfilter/split.c index a77ce6f6f1..b02584d0ab 100644 --- a/libavfilter/split.c +++ b/libavfilter/split.c @@ -56,23 +56,13 @@ static av_cold int split_init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); - if ((ret = ff_append_outpad(ctx, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_append_outpad_free_name(ctx, &pad)) < 0) return ret; - } } return 0; } -static av_cold void split_uninit(AVFilterContext *ctx) -{ - int i; - - for (i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); -} - static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; @@ -124,7 +114,6 @@ const AVFilter ff_vf_split = { .priv_size = sizeof(SplitContext), .priv_class = &split_class, .init = split_init, - .uninit = split_uninit, FILTER_INPUTS(avfilter_vf_split_inputs), .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, @@ -144,7 +133,6 @@ const AVFilter ff_af_asplit = { .priv_size = sizeof(SplitContext), .priv_class = &asplit_class, .init = split_init, - .uninit = split_uninit, FILTER_INPUTS(avfilter_af_asplit_inputs), .outputs = NULL, .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS,