From patchwork Thu Aug 12 01:43:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29445 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp309521iod; Wed, 11 Aug 2021 18:48:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznGPVDzy+9n7o17L3cDYGxJ9lnd5hYKTQ3QtQb+KhIMrQhC5Xrxe4FJZkotBFjKEh63By1 X-Received: by 2002:a05:6402:70b:: with SMTP id w11mr2409652edx.189.1628732888859; Wed, 11 Aug 2021 18:48:08 -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 ck5si911194ejb.35.2021.08.11.18.48.08; Wed, 11 Aug 2021 18:48:08 -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="GID0//02"; 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 8A49968A605; Thu, 12 Aug 2021 04:45:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2022.outbound.protection.outlook.com [40.92.89.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BC4468A5D1 for ; Thu, 12 Aug 2021 04:45:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CiGGZA4dk2shRLDCIxwjlIJG82FKAkhxve4sGrMrzJwwkTLOT38uwGADEcQfTdkEcGQMT0EwZOdm5k4AnupNeRAszkcGLLqpFJPfQQhGMHEWlZEWdd4UzfgTX3OjivrWk8NANWZAn1t3Zf4pJi7pdACNkiFudIj652nQl4EsmwPfQoIdGwolJl/BEeInocNsCmUwO82fQtzkWy8fY5tqHy5/nN0z7cEWo/lrm+cR72MHCRb+MPoSxYaiJEs/FETD3Q/u8RGkPq8tShgKyh03ziyYEn/SUeH+QQixTAm1apNFw9Hh0SpJtQ4I7bAPQCNX0YkegP6ZzhrDaj6YCSHkug== 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=IL9IHKBcamVbWrz2MeKieiEJASXsS22mc8Wh43Jt3F4=; b=gab6dsgfQgX3yLBdSpfQcLI8zFyRBRh8vtceKLCDIvGip3uuVKztAZbf3pFN2nHnuqBgCDgLYVO5QCq7WaUZ9HFECcaLgRJBmhmGl9+UrBeHnclpeKQ8qUYeHiqXiscqMhBFI8HdlE3lW6D0x0wL8CnjF+nGsgxp+QJN620q7GITTo36tByZWaAVNTIsizIluAxQs9LIJ1hh++TVB4qYM+Rwp7LbJFqky57qb/S34NAYnmGpNcYmxh50tjSwFoIwXQ/lg+5uFEKJQqE01ZVuQ3UPpBd9n9ucU81zf+HsiKhDXHOYdpE8im87bxma1LcSXqUNRK9dYNXk5DcoxJu/2A== 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=IL9IHKBcamVbWrz2MeKieiEJASXsS22mc8Wh43Jt3F4=; b=GID0//02HscREGlQTwbXSaZcT9BoVlna4cp1zvdpDjP9sBq4v1b6418+J0I0osH8bXdpSWRZ6vtg37YuvRIWvinVENGfqhaJQhCX5imhQGSbFtoJvmPvsKLZHxqVX+an5zSPN38Nrm+EROxlgGC6L18W+Efnvnxz83cf7mvCnqkJitQ2knVSUgsfNAMcg4X97VUXLw8hb8GE1jFYZal11rEtef8DyAnBRCPfSfnctfpmtE+mCX4p9SLhcFGUc2Y2UloFBC8sK5lCwOTFoQKP31H/HulTPiobi3ZDpCGb+BnvShrN72Lq1V9KTjQU3kUrDScd0nHbSL0LGcrJB/klEw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6895.eurprd03.prod.outlook.com (2603:10a6:102:e7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16; Thu, 12 Aug 2021 01:45:21 +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:45:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Aug 2021 03:43:56 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [QsmFyLSJOilm0zv9X2S5j+QDX17HMvHu] 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-21-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:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d713a8ac-d3bf-4fb1-73ea-08d95d32bc6c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNURbsX3daqRjUwmYWt9FJP71B6TqUQUtzEqD6Xt4WLKjIW3WJdx2Er+OUVGGz9PkfXYDqKrE8j7Ezka1ZyF5tWSdlWCRHP7+9FWK4jPKXM17Y5GbsNhZ6R9bpsw65WH3OS5iJrClqwPjoLye66DBPns927013Rp2qxqQEHEHgbeqlgobEpQivrvBaqXsojGThp5vAJAgHWUj4GUhv3O32d9amr7x0+EgkBcD5EB84zF15U6zkOjpIfWvFThwUB0fgzX+QEnLpK5uKhnSNYtQcDOesqL2HyYDTk5OX2AjbL4u1Of90uOvG7kSOhjJ5fo1jLETsLr0aByEhERaJBZMyxlTIpEPcNM13iL6Klv9pNIy9VL8SiqPULf3TP3+qKNOZbaaI+cmy/sdYaSHTy+tB/uErRbv+vCvOuMNLdhJRFvpyvd5fuFJmJjQCN6Khu/nCxA6hn2/WsGt5c5p3jDRJ7oE0/4XIML4MYpDDZcSUls4jBQeSa0iAJteHXEEmA7h2bx7WIDZPo3qHGStCeAg/qOd4CRtAOR6b1z/VPp/EL3lnMQZ+vx1ZiK1jAmgv3YskVpHU4PKeNMBCb5pXdguFEsMPYd2KvemauqMiTlJ56hRHInaxVKQ2YKYi4981l747LQcPQbERCj82SXbKZHJA0dRH2r8RqdmuM3r8lwCIpYvWTZU6K5Cv3lxUOWQ0AnLM6PFhZ71pXj9aO3viXUpcJqrsFL0XT/deI= X-MS-TrafficTypeDiagnostic: PA4PR03MB6895: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pEI5QSdWyKvG+keIdCZ+m96F6pKPscZvmx2TyrESjonQyCN4zJGzBZiBIqaD7nbsvBvAq5b1ygSIt+l7R+qHGlDk0o9KmKpeW/FBlY4tjRBe/XfgkPOz4T2pPf1hI0LETBuH2cW0KCr8VIJ+/Ii4tPAfEPZyAoICVbklYgSnGx5/xvtdK2dNqE6NFQiG9WwsGxnc7woTIme1lALdpiWrTecmhgq/exw4S24y60M4NxAhm3vx0KFtsRc1NEy2liw5+wBT0YRZapzLj2JZbFtrBXeycA1Ndv/zsM+EVRv9bi8VI65QK2srbI8Yjj6mBySFPh3fDZJ8G5xTZMVJkCqiGgxJDnddMkxRRpdrKnXx7rEYv0y0S5E6+qtJ6PBCZ9SkvATl/VlECtfREKEqOUvGIfVsAqazzsoStvYPeirI/wE/vZyi5oeqX2cHVIM1zquZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZkNVQNt8J3JTVnlPaNr1AaxFzLgkOSjxGtC8w5KmsXSVgXftj+Q2cpl+l0+RUykx8PT3i6PeKmRE1VJPsmwfW+kGwiB2opMAEDK/LmvoaaOMzvNnUiG06IbpQoEK14uHd4wgp5ng9igVBrAdUJK4+A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d713a8ac-d3bf-4fb1-73ea-08d95d32bc6c 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:34.2649 (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: PA4PR03MB6895 Subject: [FFmpeg-devel] [PATCH 22/23] avfilter/vf_xmedian: 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: SaSBPor/0Ubu This affects only the xmedian filter, not tmedian. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_xmedian.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c index 168a5944db..c01f9ff202 100644 --- a/libavfilter/vf_xmedian.c +++ b/libavfilter/vf_xmedian.c @@ -121,10 +121,8 @@ static av_cold int init(AVFilterContext *ctx) if (!pad.name) return AVERROR(ENOMEM); - if ((ret = ff_insert_inpad(ctx, i, &pad)) < 0) { - av_freep(&pad.name); + if ((ret = ff_insert_inpad(ctx, i, &pad)) < 0) return ret; - } } return 0; @@ -337,8 +335,6 @@ static av_cold void uninit(AVFilterContext *ctx) ff_framesync_uninit(&s->fs); - for (int i = 0; i < ctx->nb_inputs && !s->tmedian; i++) - av_freep(&ctx->input_pads[i].name); for (int i = 0; i < s->nb_frames && s->frames && s->tmedian; i++) av_frame_free(&s->frames[i]); av_freep(&s->frames); @@ -404,6 +400,7 @@ const AVFilter ff_vf_xmedian = { .activate = activate, .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, + .flags_internal = FF_FILTER_FLAG_FREE_INPADS, .process_command = process_command, };