From patchwork Sat Sep 11 23:40:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30154 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2757265iov; Sat, 11 Sep 2021 16:42:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCD0ZztMIq31Ed5/ZqrINRpCGppV9q4haosj/a0XR4m2l3AQZQQP22w4jMF3l41VqhSFge X-Received: by 2002:aa7:c952:: with SMTP id h18mr5476282edt.18.1631403775588; Sat, 11 Sep 2021 16:42:55 -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 e1si3746519ejy.467.2021.09.11.16.42.55; Sat, 11 Sep 2021 16:42:55 -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=ix2PSdHN; 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 47BB568A8C1; Sun, 12 Sep 2021 02:41:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2068.outbound.protection.outlook.com [40.92.91.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46A7268A8B1 for ; Sun, 12 Sep 2021 02:41:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kNVhjaB/lIQYvitRY670q6weReuvzqAEHua+EYpQuflw651GgemqMHch2UQYIwMwUJswBOVekcR1jL6g5L5bEtqRNCXvTaIu9a8b70+dgIi5kCBqw14WDW8f9lUMyiyfCbhePEFAXOplnLPA5gtOQxQrWtl2r31Q7WwJclkLf7SC2ffOQribzTEhMz1sNvFNkzlsaauoD36LDaciZa7Ub2uE3E61UNXsGu513pxffe2Q1XZ2CqsgjRO0XNtlMb5KTUZ+MRS1JFmwdEmwfrQehJ+1mVfc4YrxmON7QTzWrDRpehnJsH5AFlSvxFHYlg7F7ar/LgOA7caQdiBFpThkLg== 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=k8SxNxmGtwG2X9TRNTTLrTCBOyDUFv2EjVc64cntQio=; b=lN1F1sHi1ZcOfzhsoTij5Dn24QQUM4Qkhv0LV5kBKhpVT6TqTqGg78FJkAmzeqQt6aCZ6POO6FYvknGN1tPYhV67ZY9fxxZ53T+DsRP3tOdEEXdZCgjJTPGVIvkLVBESaab+6+NHdnsF/aqHG4vjFmpO4iJbQdXf+joj6WY0NO1Kzsc54D/4FGvQnA0JscNrzmQkx+DApGJJxlUcgdz5B1t4brg6Ai8Bj0lD9D1rp6asClTarsAnQkqKJd2x3tPN1oJxDkWt6MJjsEUe+pHg8ga9/3Y2Pn52XNLPMg0H/82pxBAqyROOw6gfDAdojR1wh3cRmrU+ltVH4VDKy7PXtQ== 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=k8SxNxmGtwG2X9TRNTTLrTCBOyDUFv2EjVc64cntQio=; b=ix2PSdHNvkE0JybbWX913J1DqwjAH01/4fEN+VyL6qalK69aGFkWV2mRQ4h5tUOlT3pfMD+XUTwBH+PJMKvLBNd1spEC6oNBSl0X6HiQFk+LdZLyoIPfCDwf17bNOyfeoNcSH4Ehbu5z4x6wWuIoDkUSiUDeJwVTc6nSzelL4iTsoRpo62azPWxKrPwcQcj5cSDAQZseJJJppth8+TNWgw1RbQowCzOoDQWtV5haQuTgWijbAA6Rh3k9so/66RJLt3icEWPbwXfYD1mWjiOj8rf6kiTp0vyBYs2XIpGC1UjgsRbXhjIWfb/Syi2yqeVL9ipShur98jNTu6V3d3jl9A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5047.eurprd03.prod.outlook.com (2603:10a6:20b:89::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 23:41:32 +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:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:39 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [hntgyySJdRM9J1SFkONCUbxJORQA6zlF] 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-8-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:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cf8b2955-088c-4aad-8a8a-08d9757daf8a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMksTRFWjkHU2ce/cyBvv6mD7LWuzi25m7IdsL1M8u5GeXn+FE6zLr+F1Ebr3bnhG1ftAr74wMVsL/cql8gFJf5IILTLdi7Y5veBC9lySxru5KvRJY0gw+rAnm4D2UYDMw8uOykIpJTOcdtPZ6w/iEH0zMbFoBYg2b1I5kVHE9w3xi0dbrRSH5BUpFatfqgB16Rvv+p/3iC0OyAM/HQTnjSSB7c9RKIkqt/NQXk94WCRLzb/jegz6Qj92O85FPUmnw0N6hLA8O11ZuPpfa7HiepkMr2Izd9fnduH8oHTBzN9bPTxW7f2F4Pz2ZzFR2WD+KgbVwSb8M7ycJJbHxAsD2aPzMpiuGxxeWZ9vkfkNPuRcg1qp8DEuKvYwfL35892FQYR4ao4Bg2RQXB0BX8cwowm+zBI8UvVWVSgnnHhHSTpnLj8OfvqEWlt7hWDtukLtjxtwxBAIdR6VUigKmYD2QcNDfER9RetIIHfSWaxyErv9qKAwB4Zw3qRZ/qawQdPM15/293UcENG4xUjso13y8q/lwwq4E9u4KNnEw0xkJV3Sye0IkSHex7SbIOa5Yb3q7JmcnCw7KIzTwhdMrDMfWWdDB4hYWvTnPctPCUoBmK5Ln449nyKG4W3niYGV1QmrI2dwO7Uj91MkYijtRIAExFnvfRzGPbQBpL4ZdC7zNxQsQ4sAhvpsew0/BT24Gxb633fn6ugj5UQ8= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VsZhtK680ONMj7XSc3DwBTmUMgBWCkAKJsAOBc1sEIGWClEvQMJMnBP4d87QmTmRjvzaWfhBB7sgfGw7qBZH2kU7pVUdJoZg/7le5xHYyEKjvRSPIqv3gYhR6QHPCu8ibf4LxxVghWxOak8WKT3LLfwuKgfJ5zthZzGzZRTRuL9iFDef3HiTHTaUGwcWMHNL0dHUpcWoN7ubpReDG5+KsxAbrir5F2Q0LmhZe3PXS/uXKmBbdazDpjGupKyvzLCLfleTFNIxrpMqpA3rtTCKF1JfhXtzPGJavbAtpJPPQBRiANV3u/Vcg8gCnwuXCClCcyPdkgkuZHA9na5wa1JAHIY5KGgSQDFnWq6DmOTLxh3eGuwChHiqOV7KhVkl+Hi8OTtndoB1D6M+TGSGXQIiTpja3ZlhqA2PKYe0pqdD5/GBz86waTuXjXBsCpma36oJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jdU4Lo4gU5HVJ8SUbOHQrNMZfu9bLeKe++gyZR7sq2iTpISos4BJM0B9b/1V2eI4Xf0ja6P59moFH7o8KQJUhmBw+WaSmo5TsELvYu/u0YjEOR4gqM/9TUx5kiIWKyZmt9MXnx/z2ryADQC/wytOZQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf8b2955-088c-4aad-8a8a-08d9757daf8a 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:32.7951 (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: AM6PR03MB5047 Subject: [FFmpeg-devel] [PATCH 09/39] avfilter/f_cue: 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: 2mykBB2YheiE Signed-off-by: Andreas Rheinhardt --- libavfilter/f_cue.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavfilter/f_cue.c b/libavfilter/f_cue.c index e87b7a67c7..fd55e4bf5f 100644 --- a/libavfilter/f_cue.c +++ b/libavfilter/f_cue.c @@ -94,10 +94,9 @@ static const AVOption options[] = { { NULL } }; -#if CONFIG_CUE_FILTER -#define cue_options options -AVFILTER_DEFINE_CLASS(cue); +AVFILTER_DEFINE_CLASS_EXT(cue_acue, "(a)cue", options); +#if CONFIG_CUE_FILTER static const AVFilterPad cue_inputs[] = { { .name = "default", @@ -115,8 +114,8 @@ static const AVFilterPad cue_outputs[] = { const AVFilter ff_vf_cue = { .name = "cue", .description = NULL_IF_CONFIG_SMALL("Delay filtering to match a cue."), + .priv_class = &cue_acue_class, .priv_size = sizeof(CueContext), - .priv_class = &cue_class, FILTER_INPUTS(cue_inputs), FILTER_OUTPUTS(cue_outputs), .activate = activate, @@ -124,9 +123,6 @@ const AVFilter ff_vf_cue = { #endif /* CONFIG_CUE_FILTER */ #if CONFIG_ACUE_FILTER -#define acue_options options -AVFILTER_DEFINE_CLASS(acue); - static const AVFilterPad acue_inputs[] = { { .name = "default", @@ -144,8 +140,8 @@ static const AVFilterPad acue_outputs[] = { const AVFilter ff_af_acue = { .name = "acue", .description = NULL_IF_CONFIG_SMALL("Delay filtering to match a cue."), + .priv_class = &cue_acue_class, .priv_size = sizeof(CueContext), - .priv_class = &acue_class, FILTER_INPUTS(acue_inputs), FILTER_OUTPUTS(acue_outputs), .activate = activate,