From patchwork Thu Aug 12 01:43: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: 29453 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp307990iod; Wed, 11 Aug 2021 18:45:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwLwzb4uVpFqbkz5ePQ6pCWpETduCAfEZh544qxS/RN1YCSEhRTZOw+TphZ0k6vrMgdMmw X-Received: by 2002:a17:906:c08e:: with SMTP id f14mr1337514ejz.380.1628732753688; Wed, 11 Aug 2021 18:45:53 -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 4si744341ejm.546.2021.08.11.18.45.53; Wed, 11 Aug 2021 18:45:53 -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=nr0NhStU; 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 2837D68A4D1; Thu, 12 Aug 2021 04:44:46 +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 8588C68A2D1 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=mKJs1+A7J9p8AN6TYiMMwoEKIaYuAbhWYuj5cr8/pgoWCIKrb9cNHkyUAk5ByEGfuNW6ajNqzb9FiDNwlw3IXYZJXcdog/tfzll43eYn7GoAIZvPvMkNmNzs3tKWayr+PzmT3jfIs9eOj3k4933sWAIySQ+4SAD4EcvpbCt5L6C7maaQUuVN9bkDvYfEPi4s2rMo34P5m2CeqIBcw1upGleefxTXKyu2SKEfOIY+Pp/mknzoxbZpJ3zYCeZje0LwkoZkaXo/Wy0gwwwwwNfVdoUcYic5K4eri5E3urKf8q0y9jTZ6EIeTLOTYT5M7IdxS1bDH5PDBRGxCT5ewoFkEQ== 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=CdAzVn9QOT4dzdUnYKAlYoSau8wYbjkfIpIkumkWXLg=; b=TQw89X17D8B+gbfJJvhjTrvJdtmI+RzK+aiLGDYHl1UX9eV/pRqrCiuYtG/O+310DizDt+JTa/tsaz3U2Pfjsy3Uu/sMw0iERnTCyCf2Y//koup1An6RrYVoKLikp78Pbleu3ogk1V4gIPEZuV9umn0t5+LS5uA/b3wwp3iPi9pBS+hOn0thw/2B3sapRm0zLgWyR5gUll8NGZXZtu2vDW9QVPw2NgNchunfRFDZVGUP6mZOymmiDvJGjf43a4EBHvPFm5RSUfPjuc1qkZzGxBBJ0qXUJVFZRYmog85n6979ZFWvIGuBZjN+6B6wus1ZGAbDuZnVNFepPSZz4l86lQ== 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=CdAzVn9QOT4dzdUnYKAlYoSau8wYbjkfIpIkumkWXLg=; b=nr0NhStUImXbaqJrcvgwdhV8aEnYqPXM1mGrrqHRRoxsWlFEhlZtTdUmdBWzhzmRlRT7nDSW2QccI2cOEBwvDn+zh++VCaylsGiPYmXLp7Ii4XhKoAKb4fmHF3MEBP9mINTK2gSzAbjCDvwKAD14AK2IEunq/CM9lRQoVOFQtXoqBx2GPOFToqJej0Bky7ZHHoNMfqLx3AEN5jPWCcqdnEWkKyquEETlKT4zaU9xbDznWveht3FPS8p6ClVa6fWmnMHIGEIUCrEvAfO4CTStlP5VAOFWr4rd4OO+fGEYQTi0GE75V+kWKjGU3b/MJGgtrfhXsx3GuTFq0w8BZkL08w== 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:37 +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:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [HkMDk07TVDCzP8KgyXIEnbe1fbxtEpP3] 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-10-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: 42f077ad-139b-48e6-62fe-08d95d32b987 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQn/xz8DLlgU+MG9b7M0+VRYeBZEpfKOkUnpgNueN7+/qPNlcDHlvkQylxIo3asUOIfsrDy8lQcabjAwU50u1Np/xMY54M8OBRZoMiCjJAyHLswhF1h9sPfiqKyuvmAiQlMmwbOXyPEv1tWvCNoGcY3hFfFetV3Q8X2v7nY4YuoyVM2d2vFGDuz8ySV0iqFg92HcxUtt3WZRJezrnJuGlUittA88/QkeTRkjB8sf0Aj18LVlL439h8nGLSr95G+qVF2n+05pVXPFadccuLjfBOCHAkDZmXKP9n45b3/Kj8Jg7Obnvnncbhdf3UcGo2+NwXTurajvsrOqcXxhe+/o3ct3BRLKNkFhFFI5A3qo7Qqu5PrNcaHnBBUIjHQrSLQYInTyBY92o+icpPORQ8+fVCY98d97UgC4KS8PHdo+LhKWACox1vlguBrpUsGkOMJh6KTcVDbdG8bRShow09fjRm0JsM5S6pP0PzpGErLhu//IgLswJrj+SL73klNbtn20QUALrW4B8RZ9D9AuWpRqFcvm8jFfL51donh6gDPy/7yQ0OtuhiXVpwg1Fp06ajmcqUgl/GOiBG90DLUB5yt64Vd31XQfS4K5MrF/PeUrfNICtPD/eTh4HUqrCnrkC4jr4G+occbr1P1Y3WzjlGQb2PVoNQlkiytkCwCMpVji/wQbt8iQgWiRkfgXvPo1VUJ4SCTW41uGEEImQIBay02Z1DGR+2fMGsgVWXXzNeGiiktVHMNuXoJJquNwT0KQSg2Vno= X-MS-TrafficTypeDiagnostic: PR2PR03MB5371: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AE11bZBcGY0NdvIJtpQ7eC96IhN1qBNe/Y6+ExSbtYk9NjUiSBMSBUrQfn4US9PMIPBGS6DiZHJfDLj/r44RDMjTXJP2axS6BfzFRBFg+ZHqwSZoqbRi4dkED86qz2gWXsbyJ5is/XseoSAR9SZPX8//HGVk0ODTBs09xy28Y8+RCtC5yuD5oYNvVXBDh0ayLoTlAcSm3ZDSFomCEALkiHvvQrQS3dNKoXe7xDEMiXQfIg7nZR28hjEhb6oJ15PnvVVIMy8aEFhEabHhXjZlhG4SMRymDfosL6cAUHs59lL4SkDvRJYfft7MweSUSDt7R8aImQrlFq7lLRfjrzTLHlV2jHBxSU/igJ1Fn7wfbhHl++cPxGImYCAooFKEKSGLAfZ/SQO3jXUBEy2oYA7C4jnxCjOL2ZDL20k6HqhkKMaDjlaqo5Evw8apZcSrcSb6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xYXPAO9yFfYnaF1Nj1H9JryaYzF/OFKoZZzewCxpuAElkKc0IQYxn6K6ZtdjjzJ63UdqrZZu9HkJ45ObOdZI64x8wVIH60f+5tJk3LbdksVsL3mA8f3qT1GH+NUmuicsrfiWGdtkTSeh9EDVSNESUw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42f077ad-139b-48e6-62fe-08d95d32b987 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:29.3943 (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 11/23] avfilter/f_interleave: 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: b91QkxtflDbj Signed-off-by: Andreas Rheinhardt --- libavfilter/f_interleave.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavfilter/f_interleave.c b/libavfilter/f_interleave.c index 259952b591..b2c0305797 100644 --- a/libavfilter/f_interleave.c +++ b/libavfilter/f_interleave.c @@ -173,21 +173,13 @@ static av_cold int init(AVFilterContext *ctx) default: av_assert0(0); } - if ((ret = ff_insert_inpad(ctx, i, &inpad)) < 0) { - av_freep(&inpad.name); + if ((ret = ff_insert_inpad(ctx, i, &inpad)) < 0) return ret; - } } return 0; } -static av_cold void uninit(AVFilterContext *ctx) -{ - for (int i = 0; i < ctx->nb_inputs; i++) - av_freep(&ctx->input_pads[i].name); -} - static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; @@ -243,11 +235,11 @@ const AVFilter ff_vf_interleave = { .description = NULL_IF_CONFIG_SMALL("Temporally interleave video inputs."), .priv_size = sizeof(InterleaveContext), .init = init, - .uninit = uninit, .activate = activate, .outputs = interleave_outputs, .priv_class = &interleave_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, }; #endif @@ -271,11 +263,11 @@ const AVFilter ff_af_ainterleave = { .description = NULL_IF_CONFIG_SMALL("Temporally interleave audio inputs."), .priv_size = sizeof(InterleaveContext), .init = init, - .uninit = uninit, .activate = activate, .outputs = ainterleave_outputs, .priv_class = &ainterleave_class, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, }; #endif