From patchwork Thu Aug 12 01:43:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29461 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp308548iod; Wed, 11 Aug 2021 18:46:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWce58IDEcfnxxhSVtEqVWY7T+WMxRVnYv2RSMdbasVrvR3hW/3Tu+RJsoIWG8mZZccxXp X-Received: by 2002:a50:fc96:: with SMTP id f22mr2440473edq.367.1628732800223; Wed, 11 Aug 2021 18:46:40 -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 t13si1165691edc.254.2021.08.11.18.46.27; Wed, 11 Aug 2021 18:46:40 -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=qhfsleMp; 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 2A9C668A4FE; Thu, 12 Aug 2021 04:44:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01olkn0098.outbound.protection.outlook.com [40.92.77.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8017E68A408 for ; Thu, 12 Aug 2021 04:44:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O5x35PZLikhcFHW/yEKxvh7+UcjKedKrKcLWNP8fhpzm80XpveuQ2tdyI9tWyBbZA4qn2r7JxHrCYQXtQnlZcrnUIwmv7umjuDX2qohxn2F3PJB2gSc49BSmlOlP8gbzA6kI4er87TnejIx+p59b/9xwUhn6Pt4W1+RsyNo3HKdWVU3o7kTCge5YrruGCFprtDCUY6VFFSDFUI89G6cn+LfvTPfVPDQosm8GT3UzdvVLAkjJZV3iiyOqoGAYayo5e7JsZDhPlrnYwrq17pweaLPUqNVyUg0RBF4akw6FLzA8AWuv43B/Uzah7k2kVIy3ZnStWfnv9Urg0QK+R1mKdg== 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=Kq8ltGigFSR5rdA+SD0VsYJx5dRg9aldiOCpYrG775o=; b=dWPegqnS4P9xszFisyWMIHPF+jKSL2db6KDrczRnHZxqpHSNFxVa0ykjAo2ixlFwe2gumc6ehmRai5IMan+k3cF/jlIKiVTfOWfD/hEBygaCrEtl79UztpPoFX2Od4UXcDO3aoXo5vQKWt1IxC1ibwT3iNNwvW4ekizXs6QB3pIJj1KyGYN2bUpWOpx/4js9OeNmgPNnwak69pzrZ4+r2UdZzbN/su6T0W/q2hDmQoCo9h9e6kfigsk7WMFO78XBLU1YnHVLUOnwf71lY9RSNY0nIwDwjdvX025gRkAhz1NDm/trynosEmA+eQ32eqUwti78rcOptnRtkHPOVyxcGQ== 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=Kq8ltGigFSR5rdA+SD0VsYJx5dRg9aldiOCpYrG775o=; b=qhfsleMpB9dXFuADcHUvQVc2i23TiUwSfyI3eAEvVlySLY2nQsLTmK9QisJv9DPphFkMMHlmJWCL8cln/wCAFUW1qD9knH8MyykSdvz+BU+NsWf2rb0ekurS1WnI4WlxHdPSLYGbk97BCEeyN2/N1Pqv9OY3TuVv8Onhs2KVQB3+FmS6Rgtp5PiNYqRjnQr/skR6xK2l2/6zo+mOTe4MTgrpR1XFJHrVMSl/xYygM2Wt/5V3IlQ3ilVotATv3PPAmbGYacGf8G692y6xnkKniydn35m+GAKYiEVEUqDv0S0BguzhSMD7n21tJ4VqXPi+gxMj3vIVo4K/4PICSlVPcQ== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PR2PR03MB5371.eurprd03.prod.outlook.com (2603:10a6:101:1f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Thu, 12 Aug 2021 01:44:50 +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.4394.023; Thu, 12 Aug 2021 01:44:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:47 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [zJySegXEH7r5k1DtYYhPQ6M3hcXg+7ui] X-ClientProxiedBy: AM8P251CA0021.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:21b::26) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210812014357.1098150-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.93.129) by AM8P251CA0021.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:21b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Thu, 12 Aug 2021 01:44:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e659c00-ce64-4c72-c5b5-08d95d32ba0c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VRYeBZEpfKOkUnpgNueN7+/qyf//AHGc/+0qmYKELNSp3SNzTsx4UBxvRO3Xc/ajrtuXYpeqjATMNZYZDJa3CDXQi6mAsDZ8FC8QFRk2R/R/xYkGxj+XVNlzVl8o3UoC0/qPuEPoeJJW8/4ePbw67snS3bgsvnMiJ3OuEqaBJ5j9Lt2kjiD2fc33u6YdYrfhEpLfDvBqfuj8qNpMKT7HRMg9+on2zlFZfi7jTADzw1HYCeHdW/fDSEM3MUTqAhuO/js6NeYwQNGKwAzv2dUb2A+c14AtCCP8gutyi+BxND/z9Rcy6Ys6GoM4xb0lrUmu1PQkqUAuNBw3IWad0oBqSTMiQtDr3B9PQb3Ot9BR5F4UfuJ1xo2hadDiIe4jVwukOBo3LlsOPGqs7t2rNidP1AfALGB5gt5Bq0JSIIlSt49/MhQ7IRCS7/jyhLQfXAqr7b6xUbxNPJpgvVO7XAdoeDm+M+PiiyXBlieNWyeDZqdpCQ46JetPviY5m5iUYklLDbTuXDijls9zNQSqwMC5UnueBWllP2+zfUtqAte3SqtAfiUtwVBBiO/Q6rxEn+DkRvENqkR0ErDzadLMxC+8ASAseqZX8dWlSb47VznGjKCuzFNtBLI5JVYBgLXLutuiaetbK9Dnc/qaNRgmhB5vq4glHlTnDJtRteD2YVh4a7I3H3ev8rjI8AuXyndO3cJEbfCwCPffp6BvzT88Qqwswmmn6Uxpco1Oef/wZioNZCCb0= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DJpu4vw1VBX/w2QeHHxkdig4WvBaCWBTWkLzDJXNCkmlM6ic84rL5SqPPm2GSHqqAHOBeY0d5KcHSKjWb70CfPU0byWrNOZ2wizRnfimW9qsq19aMeaOvFbiTrvtbkbBjhXcgVxqDexM1/BVzoW0MG2DbDipwjRLamVAFiKRJYAmhkvryRD3EcKn2gGJGrHyxKD2hbpab9J69YVyoAfI51xa+eqUK2ZAE6i4f4TdYWNHzM+VFoRc6JRJydnI8gH7fzJIwrUxXbNqsVFettvknNCxRvcQBMj+7vpVfGEq+RcRbampLQE1JWDTF3xD53ycF13Gua/v047VEsMjOQ25SyV7vyRuqItJKGOZMsjcROPdjJtlrYjiTSNcOdYw3VNKH3Qst4aB1PsUAxEsk2p/1UQtyfLkIIJkNZ3I1WcI397R6W5NqaRf9iU7pKhE3dLw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WeV7QE9X2Gg+Bnt3eXwuuYPIxClv13J/+mHK2Nbuxyuz3aISxgIzcMAl1Aw9Ds1SU688oalFTyeGJU06YnYbC9mDApo9Vp0ZS7yKuTHKg63XREdy1rwOxcPv+oYKNNOFuniQNuoTlAD6B6PEOCA42A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e659c00-ce64-4c72-c5b5-08d95d32ba0c X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2021 01:44:30.2555 (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: PR2PR03MB5371 Subject: [FFmpeg-devel] [PATCH 13/23] avfilter/f_streamselect: 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: Dzm0oyP+oZsF Signed-off-by: Andreas Rheinhardt --- libavfilter/f_streamselect.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c index 22eb76d4d7..7762cdb3d1 100644 --- a/libavfilter/f_streamselect.c +++ b/libavfilter/f_streamselect.c @@ -172,11 +172,8 @@ static int parse_definition(AVFilterContext *ctx, int nb_pads, int is_input, int pad.config_props = config_output; ret = ff_insert_outpad(ctx, i, &pad); } - - if (ret < 0) { - av_freep(&pad.name); + if (ret < 0) return ret; - } } return 0; @@ -295,12 +292,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->map); av_freep(&s->frames); ff_framesync_uninit(&s->fs); - - for (int i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); - - for (int i = 0; i < ctx->nb_outputs; i++) - av_freep(&ctx->output_pads[i].name); } static int query_formats(AVFilterContext *ctx) @@ -338,6 +329,7 @@ const AVFilter ff_vf_streamselect = { .priv_size = sizeof(StreamSelectContext), .priv_class = &streamselect_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_OUTPADS | FF_FILTER_FLAG_FREE_INPADS, }; #define astreamselect_options streamselect_options @@ -354,4 +346,5 @@ const AVFilter ff_af_astreamselect = { .priv_size = sizeof(StreamSelectContext), .priv_class = &astreamselect_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_DYNAMIC_OUTPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_OUTPADS | FF_FILTER_FLAG_FREE_INPADS, };