From patchwork Sun Aug 22 00:47:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29712 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:b707:0:0:0:0:0 with SMTP id t7csp652977ybj; Sat, 21 Aug 2021 17:48:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCWSewvV2HaDalMr+v110R7/C4FO5nDEFSZO/fw9pNx37ma2OfIJT9rxQvSKcQRak9OTdc X-Received: by 2002:a05:6402:2794:: with SMTP id b20mr30936460ede.126.1629593335066; Sat, 21 Aug 2021 17:48:55 -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 t14si10466916edr.573.2021.08.21.17.48.54; Sat, 21 Aug 2021 17:48:55 -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=We7PVYnA; 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 9651E68A408; Sun, 22 Aug 2021 03:48:22 +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 E16F268A2D2 for ; Sun, 22 Aug 2021 03:48:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S4+LaU5YqVX5APcHMVhKwkuBLoMmjWIGpmJBEiGkgJSxTPnYmV6CSaGThNMCNCB3ASIP7MJPETTNU5lzcgVZNcClG21BaEWLtWXx84PnGUG1A7XSB85tuXfhyhcbRz6B7XXaqjVA90nx7LReQxdEAyXwRm9L4+rulwBcp169pWTzu0BdV04BwUhyPKuTpdQXexrBu/8LLnXeX8BduUV8lvWB2BtE0Pn/krRoUkYD0cOjFsTzCwGxorzhX6YoIcLGtqzUy5SoctVLGGzlytxiorVOgIJboVsUN2XSkbZnsSjQos2ljQ/6g+zTa1EIthsAuLbD/qoS2i85jSGrwF5iFQ== 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=hD3r1wuWfnY0n+PuTLmdgdj+j2T2a3DPk5yMlUZq9fY=; b=P5jAhr6uixoCBa3F6nwa3PRAziEJG8NPib2aRhYcCi5zTeuvMiNPV+iyVuaPqAJDvjuKnUfW6XoZZMDbz5P7hrItDKxlIuabswSTWb2ftAIr8ZNLP2GSCvemlZdtG2mo/iJ6L89BI7o0xZzACwY+USrK9yGe3RUh5c2XzD26iILmFKRpNOx6009VdqOUd8rhT7amS9b7eMi66xwOjhHKm84U88WC94Y/06iie1krBghzzB1EY4BgCJewo9ZrabE0mSxLg0V3wfLI0lEu4fwCNfyEHUMazKyzDR1ngAuq0Ia2QGoO4pYFteBz+WVgCvBMaCKKFPc1fNFApjeRmDTTvQ== 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=hD3r1wuWfnY0n+PuTLmdgdj+j2T2a3DPk5yMlUZq9fY=; b=We7PVYnAteLy3ljJQjOZPwOxe+54xg0t+fX3ouB090NXYVQd9PrOREYlLeCQw9SpBIezDUwELJV4rTJp8lX5y92UC5znPl4hitZPXr8+H+QHwSl1g0JEn+CHq9eomFpKgFY99DWYXvQPoHH5biZc9YBHfFDrDKUF0xR6zMjYq639WulVyyKHpEYHR/wt+TQiQnvx5tyTYEQBM/wZ4KY4CaR47mxSbiQAKKQjjxKFN55F4WrdmvGrnSYiXbwdo5YZzYTMSLMiaE8aJE3kCks9t93CG9mKJpiPAcTnVJ2O7OETDfsrXtF/bhB//N5x+DFv5BQqj8B9DVoQUD2CW6zblg== 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:07 +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:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Aug 2021 02:47:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [+hQOHPpAc4+PRNrlAqYnvxW7OgT74zNk] 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-5-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:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c6616cef-ae3a-4328-bef2-08d9650681f5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUPHJiP61NwviEKWmldPD2hOMrq7iUo0JU8QzgWUblJ7yEf58oqeaxbVZf+6QGw7lgf3z170aw8Bq+opGq8wq2vpXwPM77SlTGe6DJBX+E1sN/JPnTj/bO/aXatXywIdLBMVHHQ5bPYPphKEsMta9rkVz6JUArVkN1Xq+8SMCr/C94BtHit6/zEe8P+bPirF4tk5kwAKz6uoed+l0AniEZQQenTIvIf3nhPVhrLJCTV7zcUVzODxjhI3/H2iqgov54wI8fdKsU1sQ8QwsrQeM6tBSCwBGeawQtkTfYhSL+7XyCaTPJFIH9d+wYmVLbyoxN22fMCseHkWDf03/T4mJv1y4CpKm4DDFKqPZ+fo5PA9EJM1B1eH8fLch3iurve0ByrJORfhYYkuSuKwLgzA/KWfpl4M9hynB3Nvl29DREIuzu5OfLThAISjX03jVw4AH//WZpuohTHjxxyHwqRZ7zoIb7RdbVfI7BaJoeBO4jPGGnqjYt5jLCvGhjJ9sDfnrLcMQLD1e04HVhlZe3pWrrVkIsLoe9f80LTRQfhLchE1Z4Y1XJGVTWApDMWVdyZoTngq4nov9GYYFziSedEoOnEVP7I5fZ0rAnVq4nL47WyxSBfMabFOcY3LSVhjCORX9A/bmNMSmuS5y9lnyb4OjnDUR/NoJoLHU8V6jLHtdYJhLtvIFnhEUMSG7eUhdkcwH8kiAbjcxwY+NpejnfhwbVFlYHUTtxtDKw= X-MS-TrafficTypeDiagnostic: PA4PR03MB6862: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9DHNus6OWGGaUTGwG5zZl27maZs/QQJ61gKV5e+6MNfDqakxyJferQi3OMsqA/zs6XAVUvd7GvUDDRxo6/Bd/MsC/qRY+QkWMOlMEYvHBdm8AT5U2xZm+1yhhPxD3HOLISuwcm861o+GZmPLaAzDNr+tTaWutoJlBKNR5Gf1MpurG4UBO01r2hcNY+I/HLnK7Adfp45q6/c5htFM4I8DKBdbZgC6Og43A4CAh1F36OMvm3xv+qa5CYAA702gadWUL5I98bC/lLMOzWYvGpOsQ5Uc79d5J/4QUpbgZPeGRhK3jJ9GHMzxPYpLzhSzy1T8ui3VmW74S+IcLNuuFHv02XI3Rq4J566dKVqbCxjzwuvfwIR0YV+8JeTla6ckk0xn8nWJrsi/yknDinX6UswN1YVTwYEmN/2oJjp5qqOCgsEWrIz+tHqwV15VBZC93veB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GGLpnXpzKnjSzdjFGl9O3UVv1wIDSE8yRKqWvsh4yg4v906RmLrTzQEW5sKmZ0xhQjyVp0nsEgt6kCALZp6uTLrRazIhB5KTxVojkMOjutvWB1Q07HYxRrm9EuNMsAyPV5KSowRCVt43SUDeuBhRYA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6616cef-ae3a-4328-bef2-08d9650681f5 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:07.6242 (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 06/25] avfilter/af_amix: 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: z56qU61Nh4PL Content-Length: 1233 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_amix.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index 9625864038..41212d922a 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -553,10 +553,8 @@ static av_cold int init(AVFilterContext *ctx) if (!pad.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; - } } s->fdsp = avpriv_float_dsp_alloc(0); @@ -589,9 +587,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->scale_norm); av_freep(&s->weights); av_freep(&s->fdsp); - - for (i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); } static int query_formats(AVFilterContext *ctx)