From patchwork Thu Aug 12 01:43:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29456 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp307769iod; Wed, 11 Aug 2021 18:45:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmCcD7zOZjinB1opv+KxV5GtGSQm34lD/hloaBD65VGnTLnkfksWAbApP+vlDXrqCoYWM3 X-Received: by 2002:a05:6402:1cb6:: with SMTP id cz22mr2397471edb.148.1628732730847; Wed, 11 Aug 2021 18:45:30 -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 dn18si1115816edb.220.2021.08.11.18.45.30; Wed, 11 Aug 2021 18:45:30 -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=o11YJ5j+; 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 6C9D668A375; Thu, 12 Aug 2021 04:44:44 +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-pr2fra01olkn0020.outbound.protection.outlook.com [40.92.77.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C1D768A2D1 for ; Thu, 12 Aug 2021 04:44:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lf9a6eK+7+WaMlU1IcndCkqXcSp41mOL34nO8bhgai424lEU7B/j656/LU/GVygwW1jlxzDqlizjzs65o/TvMW8cSpaXRg2tLsFGxttqtq5zAIVNzG1Y04D1/daSefQTEfMuzAgNNEr2yl3KEmXz/x3vlHF3dG1/BHKHP74s87yo/kwlBIShAlRDfheSP18uOPbwuuiS0qkZ1Ty7XryxMH5118ZUuDVrspLSnMATX/M9OHBalfWm2wd/3CXtn/FEyQjs3hqRTmNqpE4Jm58OBe4p4vPXMCldzrhWt8ztFNbVCN41KZ8qiT4ovuaYgiLwLX98h7M3rl75L1b0Rfgg8w== 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=xtdRjUsQk//LclUZmY0Nz5kVZpDCbw33w/kKC8Slc5w=; b=fxUMCucezIKDX/y21Ejb5MqJzKVPqACn8G/Isd+Ux6JuQJNNbnYyaEhi29PoGKLiqdNajU6SP+hgAeamXbGLNtxKcQfSHkeTbXboLMH1o1w/zsgPRBY1zuY8JJQOfuqwf5CrdCsKehmqLdGNj0C7kWWjC19GcS6ysXXq+KBIw8BC92f+gIW9UmYT01M04JWaa0AYDaNuXuAzvjX75pUQsX14fNgHNQ9QMKA43eQYua9u79MND88zOhaI8Nfxka1AN7XvcqQUIX2jVH9rbSiPf94fFAyezETsWf5y2Pvz2CvSQhpBLIP4HDMpQZxIjeAF0CGHwyVYO9QZOb501ortyg== 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=xtdRjUsQk//LclUZmY0Nz5kVZpDCbw33w/kKC8Slc5w=; b=o11YJ5j+yS5T1P93Jct39d9WmtUuSEgZytkGeBLGp68B3mxQJhcKSffdWBBVeCsuZyb4u7LhiOohwZf3egbQXmWfYrG/UL08rosLt3n3dH/aX7cZJeqUROT3h7sQl4xv1+goZycq7fecSAbaWSU3MCF1IutF+YV06Uq5CGCDctey7WPztSt6AXZh4UyudOY2OesAFUdycx8qu1ClienSVwE4Bwxpb6I+JVrFi/fN2pBuM0gImtD6Z2LMZKsrmAb0/qdvBz4bk/eftp1VC0kMn+oPy5LmuNkaWppg0RmPxduV5n0ZTgVg+NXjo1yW6BC4nfl6gpGXa7FtW2cp1w/47A== 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:36 +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:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:43 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [mf0HTk92fS72Q/juQ76+tcTPrUbnaNWw] 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-8-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:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9be3797e-67dc-4db1-5464-08d95d32b900 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VR/bi8svvK5ODZLDz+aR7eyMIDiCTDUbZ1fA4VkqNdCIUFE+x1t24V7+0JEBhdbrq2+NLFC2TJPKSMqgWeCHQka77/F+qDKZx2RU3r/oHMx1JMLImHO5ugekRgK+NlIspwMCzfY3NaTIDDltd0lSlM+D9k0plBXaSTgYeM8yO10Og1C2NcZjpzlJ75wUa14GImFH2JXPzm1bRQqYLPySzCq8+rpV8aqkltRBLGTAr0HgxbHeVbMKazF8VTJNRJJQCemtj3qTnfWf29CnS8trJWeAnCvqY12Qh48CWzR6EHBAkAOT7QteicUlGL18MzYcJCCjZqJcZivfRFCiyWW8CGj17LCTjuGr+2fdBcIl93VE1ail3r89Z1dxoXs6EatHTIRyDNFfkVHcrEN8bgjCuYA9Ai2VG8wt+wxA9oW0gwHhvVVSMUpGXRl1vWjpKpGZLGAE8rxsGO79nmmXJ/axC0Z9iwV17dRZ1W2t7tZCqPkkNQCUAX0ZP/2jdPv4v97fCqW5CYd0Ej3s27R1V4H+J/+eBdTbvYbWYaKVj78+npYslMy6MQay/FF4Px/yuTGYmgFPSxmuZ2ortoIzDqA1RXdT1oSG6v9U/Csizjf0FGgOfleWdlwtBd7l2Sc6ys2QJt276yX87bBU1ajSd8ce5omZgexki0i/wu9iYrgfzZNhFd3wB5EyoMxkknjfx+zpoXOolpBrC5GIOUJHC9kEwnjNL1nky6F4Rd3FzOYXJnEyA= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: obBDqP4NPpi9WDNpX6cQbbx3cH+g1N7pcgtChNuuyaSBQJ9d2OKVm/s6Rk8xUlYSVOfR6GzdLmm/j1nmaFbM53YFElMUsbf6gkL4fQxUUGiNRS6B7LYsWGVT6pIVb89mFt4C4btT8bvCgaqrRcrAOOSJXwYRpAM3FxILZhgBLqara8Wt6ELdsjW9bJuYuRb6vmxkZ2fPrSEzsDZFvIsJORR1QCoE56iHjwPO3apfs5GsIQlT0htZud8XUx2rsUgLpjG56Ldm7nm0+z0ESZva4lMvVjzWUkYfBmlqBNsj10zTpIoWVxNUrcxQnVwo8J7rL8vO7FN6hniPAxNGRBEWlUCqCwp6xZc0uTQ5lpkeI5n63m4nEFl3RV8zvr9pMK9DRhF9lmQHFwyPQmYUfRKani/3hqNPJ0MF2TR+saJngo/Yz51YwzqIvKLGZKRut7UE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DD5U8CD6ncpDv9nGRd/ozk8TcGEqSptRDeMA9gnEL9P0cuok5j1rroYV57qJw16FoalP5zoTEreOy+thMpkKxU+x1jlY4H0pIO2y1RNNf5RvMU2IDacLyRwlhA8/WxDxiL0ioiEgz4dBFTVEzlMWDA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9be3797e-67dc-4db1-5464-08d95d32b900 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:28.5002 (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 09/23] avfilter/af_lv2: 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: HWe3x0oiS6P9 Signed-off-by: Andreas Rheinhardt --- libavfilter/af_lv2.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavfilter/af_lv2.c b/libavfilter/af_lv2.c index 28b729691d..d97367ca99 100644 --- a/libavfilter/af_lv2.c +++ b/libavfilter/af_lv2.c @@ -393,7 +393,7 @@ static av_cold int init(AVFilterContext *ctx) const LilvPlugin *plugin; AVFilterPad pad = { NULL }; LilvNode *uri; - int i; + int i, ret; s->world = lilv_world_new(); if (!s->world) @@ -464,10 +464,8 @@ static av_cold int init(AVFilterContext *ctx) return AVERROR(ENOMEM); pad.filter_frame = filter_frame; - if (ff_insert_inpad(ctx, ctx->nb_inputs, &pad) < 0) { - av_freep(&pad.name); - return AVERROR(ENOMEM); - } + if ((ret = ff_insert_inpad(ctx, ctx->nb_inputs, &pad)) < 0) + return ret; } return 0; @@ -572,9 +570,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->maxes); av_freep(&s->controls); av_freep(&s->seq_out); - - if (ctx->nb_inputs) - av_freep(&ctx->input_pads[0].name); } static const AVFilterPad lv2_outputs[] = { @@ -598,4 +593,5 @@ const AVFilter ff_af_lv2 = { .inputs = 0, .outputs = lv2_outputs, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, };