From patchwork Sat Sep 11 23:40:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30159 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2756811iov; Sat, 11 Sep 2021 16:41:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhlffcy4+KOEjQE2enw1BMIZF1vBUIWNE9e+Cc8+SW5AS00oiZGXCl7gA7r3+5XwmL0IA8 X-Received: by 2002:a50:e795:: with SMTP id b21mr5600654edn.82.1631403718632; Sat, 11 Sep 2021 16:41:58 -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 o23si3015733eds.422.2021.09.11.16.41.58; Sat, 11 Sep 2021 16:41:58 -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=gOWVRxJJ; 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 F035568A91A; Sun, 12 Sep 2021 02:41:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068093.outbound.protection.outlook.com [40.92.68.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDCA568A881 for ; Sun, 12 Sep 2021 02:41:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U8vZxTOT8SoU/X/stVGJm39H0MbRiUhHQ8X5YlLlmFul7Rbw9eYQ+iagR0Q3Qvb6BbN3GqSu0cKZYplTaFQCBa+ACOByNVbK2y/5XQDKNHhkPkRAS4sJ3xCNKEzLLNlWEypH8YzrtOGlF+BNOvA9TynGTR+HGgyTXCHahdaNKCvK7L4jDHmL+eMna8jtJKUATr7iIU1qIZ7ZHPB/TDe10ufX6cVFzf3l0BjtmUElPJLYJSDxa2fDrhlLyQxEogsPJ5VFGyoTR52Dlr9Yko3ofdlXHcXUF4BtQlNyk9IQlRbb5c20Jkwhk6tGaMENYRWvk/E9gKMgob4HPvCDRD4+FQ== 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; bh=5EOelE7no2KvURGLkttOB+4f8qoSS8KbudBRqy4OY84=; b=LXJX2nwQ0MAEdm+Zw5jgG6wWudjwJ9PjdvgQJyH2LvAFejWG5tGc3WZ/D+DSK7MH5khkJj8R0SbWYHoJi8xTn1N4mUyv1LBgfcVGICrPTE8kQbYQNG+sRgI7IHO/60uEnlwqvoEboj93t3Q45z2/8jGDB9nIpFpjttXPuX32D2h8l/2l9I8jjqyziumU2eqz5IQP3EygPelPQG9o2aC351/+vViX9D1Y8YVQBqTo7rNUVBTYAbJt4fo7p+8sCPKG21lyjiDmDV7z0EzqRZNqj3cljbQztYBP3Nzo2K85zg2rqdQcDbb65xN56wSN1fTLYTZuvOOPNhzrxjBDGpe6Vg== 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=5EOelE7no2KvURGLkttOB+4f8qoSS8KbudBRqy4OY84=; b=gOWVRxJJYGGplIPZSQ2FJ7dRR+P+ooqmtx5Sg70lgARgqF8sJ24kIwmq4zFx5NNmb5F4AT+ITqngikzuiCtpcriyhVxrmNiXdYWy8gbRaVKaRgfsEex2F0IX4H4ST/gEZqkF2ovK5/0lWfLs0oDpql77nsaz++lBBtlyhvExI2n0n6AMIE4wKM50re4m6PLijHdTlSatS63mGPJgBz9+cKgNb10055MTcRSgjvGQq7BYoc0kJ4XtJLO5HIQrSPpg1RyNVz1k1Vjbdzb/NiYGNSN3b8Ujy1n7xOs6am+0hpghDsQmwNyp+95R5OHh6YTUvy/8hXTYd6SSlqAiTHXe4g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3399.eurprd03.prod.outlook.com (2603:10a6:209:20::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Sat, 11 Sep 2021 23:41:35 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%4]) with mapi id 15.20.4500.018; Sat, 11 Sep 2021 23:41:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:44 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [1RSxJHB4D4GMHmRpxmz7h8/1ttGmA/1f] X-ClientProxiedBy: AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210911234109.2246196-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR05CA0088.eurprd05.prod.outlook.com (2603:10a6:208:136::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Sat, 11 Sep 2021 23:41:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 98c2b03f-703f-409d-e3c8-08d9757db0ed X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMnzScHS3Rh+wVU9GGwEWWIRpobDIMxCQVA4Xav/QwYHDwr0HbivQTooBvmKWzSkknia3h9NlFeSbdbViJQUggNpX3G2JTbW4kQbTnAQ3RfOFgFpA2oNopyHhzM1qcXePTCqLX95ZDzhFm3+LX0Gud3IXDfoVfZZh4bbkYMRfCNPEhcmQU7QxIWQG8FIIQKQPUt2lfh0zyH99UcqIhhRnYamJRsBUJQJHU+XZOYbL6ETgmdiIaloMwQ1EyiMj7SWtKfNM6FkQl2fS9oxLFS/+kkLmm6LhrZ0vHS5of6r+8wTt0SYDxaDvjcmmmeVmjZth6CvgyL9z/qcGNdQbGlMxmw6HY4M9cAU5N+7+1USQPMfekgi7hiOpTh+Wn09T+gfAyFBnZkPNnK35tuS8u1f/l0fRSaxw66mH144mSUnMDnk0ztI+Spo8LSRXXUnHLHgaNXHHsB91Uh506mAQ7Wm/V+ncL8hFWNnqDnEa6IS9uKKCBI3d+wgMdj3UnZvyii0PqPhCvYz3LR0eNnDK5/qV0FR2bm6aitnzCaqb3HuuT2lyn67BIKdxYeboOJK2qW7/GLqH1lNcR1t0/94plIhoJbuW8aMREMGiG4IFRVN4RNKSWKrQSkYneOKTlmbmyqeRChqWVdIcSmdmIWcWduESsqE65wSiZVSvTFqlleaXtLBeYH9O6rV1/Wo4PCxQFiiPP+vTfugG5I8Y= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3399: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xH1+j0rN9H1EUusJPmMGrnF0bxLZj/e0qFAgbg9FfwQ+P4nV1ge7HZbwbCr2wyPIv8M9xYW9oLYKRyXFrOzetyDdlk/qWuLjqC0aq01vHWSmYovIhPJ51F2xLgP6rLOgbKOW7amFKAbpUdp0BffpVJCK/C1/BhQn99DVPk4lQp9EbsYMlJ9esT8+1tBuCWqYTihxjYUBKggMyYqVBxG6Tkl0r5I2yoQ4nS3+qL9kGFxolPZIcjNk4EGrakqG4Z+jhKTVEdSY1zNFDpCi4CDIDxjOZxQdhezJo9OEkxsaMdUfIw4qUY7HM3R2/QbcASXHaJiAQqypFbJ3Fzbr0HMJq698plqEML1RBbHKH6DNR9taqGTVc8srYH9yOPmAtk7Upa0avayd3g9sJ3X0p5lmiEcG6tz3I2kwTpWBQewcejNWwVGM4xsGAneMRK8LN4DS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EswJTbA2Kv90JGeVENYh0pJnUehlGb1D51+VurtieHR3nIIPjrXpHqLct7ciMU7H+fISeDSkbtNfa0VmMxqPccmLgCsjpD6gkD7YGMPqFHQ3BmRtURbAYx6nPR+MOrT2UCqu/hCB4vltKm45LahjLg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98c2b03f-703f-409d-e3c8-08d9757db0ed X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2021 23:41:35.1498 (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: AM6PR0302MB3399 Subject: [FFmpeg-devel] [PATCH 14/39] avfilter/f_sendcmd: Deduplicate AVClasses 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: 74TpNwq2ikze Signed-off-by: Andreas Rheinhardt --- libavfilter/f_sendcmd.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavfilter/f_sendcmd.c b/libavfilter/f_sendcmd.c index 99d8ca939c..f71d211eb4 100644 --- a/libavfilter/f_sendcmd.c +++ b/libavfilter/f_sendcmd.c @@ -572,10 +572,9 @@ end: return AVERROR(ENOSYS); } -#if CONFIG_SENDCMD_FILTER +AVFILTER_DEFINE_CLASS_EXT(sendcmd, "(a)sendcmd", options); -#define sendcmd_options options -AVFILTER_DEFINE_CLASS(sendcmd); +#if CONFIG_SENDCMD_FILTER static const AVFilterPad sendcmd_inputs[] = { { @@ -607,9 +606,6 @@ const AVFilter ff_vf_sendcmd = { #if CONFIG_ASENDCMD_FILTER -#define asendcmd_options options -AVFILTER_DEFINE_CLASS(asendcmd); - static const AVFilterPad asendcmd_inputs[] = { { .name = "default", @@ -628,12 +624,12 @@ static const AVFilterPad asendcmd_outputs[] = { const AVFilter ff_af_asendcmd = { .name = "asendcmd", .description = NULL_IF_CONFIG_SMALL("Send commands to filters."), + .priv_class = &sendcmd_class, .init = init, .uninit = uninit, .priv_size = sizeof(SendCmdContext), FILTER_INPUTS(asendcmd_inputs), FILTER_OUTPUTS(asendcmd_outputs), - .priv_class = &asendcmd_class, }; #endif