From patchwork Sat Sep 11 23:40:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30153 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2756975iov; Sat, 11 Sep 2021 16:42:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+Jt7ph/dydeVPKVWJ7FVD0yTSeQy1IepCx6aenVSRoUErKph9QZNgoYxAhfhr8Lulr3jm X-Received: by 2002:a17:906:5855:: with SMTP id h21mr4905839ejs.230.1631403737244; Sat, 11 Sep 2021 16:42:17 -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 hx27si2920445ejc.699.2021.09.11.16.42.17; Sat, 11 Sep 2021 16:42:17 -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=CLHElVBf; 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 6406668A90B; Sun, 12 Sep 2021 02:41:46 +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-am6eur05olkn2099.outbound.protection.outlook.com [40.92.91.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17C3B68A881 for ; Sun, 12 Sep 2021 02:41:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dIEr0x+v00R3Mr8LWQXxEsMkAYvpqkE0gmMU61SlNWn4q2I7r/ZZquoh5BxhaSCmUpkIFTfRD45FLPYcDbenTzC99VRR4kGEPLYYI387Sru0cQGckj5yQ4P1gJW1DcEBXdVT3AIicxsmgF0MoDBPWTpKrVCiJyF78gtIkI5dAoRYwWVcCYrTBG98wpHpajKawAPf7KeBspta25VYMSohgKvAgmEHVFyOfE4+I9t2OeCy04/GVdj1TOHFIOUcH8e+YCpozThuUdjfeTI8c3YfIPrAED+YP1WsMVu/OXeUp1WlBvN2pJO8W7L5z4girnb+18VV5ddMMx0CRyLCZ15MKQ== 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=xRIWlM8mpe+FV8SAtsfN5Le6fMdK+71A1I8TiKrOWdg=; b=QVZFo70gqyCCKgAPTvdXy8hhqcx5sbg3HYwMK9BTsYZ8fYyK3I3ZARm6QEebgeP2wFKLzouJO5bdv1Xyp7BrNXvel4iTkgxznZOhz5i8D5V6Q4jTItTeq4pwC2Xq8otw/+3K8GxuQ4qHLxcVp208rwopvVxyhWTamwSkIKpAlvqaadUQ00GwHtmcNnbwBqH9j7A48P8QaeR6eIMi6oV4ROELSN7pCP570spEgthFCNPbWzF3szyRaNTw0d/14Aaj/tnBHaJZwb6p4VmBlj8gZCTH/dfW7zReBlYDjGTnoxewFLtJxMwLhEbUgv0yGuDjLZh85MnkkjoW+JArIWYQRg== 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=xRIWlM8mpe+FV8SAtsfN5Le6fMdK+71A1I8TiKrOWdg=; b=CLHElVBftk0ahKVg9rEYVPhSi0f05Hvxa6D64yQgyOizOxHMf27L1O6qkwXivZr1x1jyC6wCpj2DhOxyO5S4ZP9qeGLnGpv8DOPs/iJe+nbIy/7KXul4aHmJHUVhxopt7ByxE5JMpMhtvW6dpmlOAoydH6zXACzOHNCIJrA+/UXSgN3D95zZHMY2avhI2AMOunMAiT6boyLFJwsCpLHpAxwAFHh7bbcoPZfVI4ifNh3zRqsbV+Io30eeOa1JyOu4LVMn6u4DSIqAHMmkzSSM1nxCDgYU9VoTlyvkycxg10PtSUCJ4VZv3IVoX1ubvu0jPRMw4fa2SpZRpvZ0kki2JA== 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:31 +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:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Sep 2021 01:40:36 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [aG6tFnYUEKAy6JrFFCnrZoTMc0LOgmqj] 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-5-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:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a44dde2d-4601-4e24-bb9d-08d9757daeac X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVv/2++Uk5pM+AmDHCluBYMnzScHS3Rh+wVU9GGwEWWIeT69taegqggL2KeWuRHf6tp7VWx2tnI6McLkTt8x1fudSF8f/FzmHnuB6zkuMYPCPS8bEjpwKFFw5VSd1W+61SpLjOwXcE1q9Ey/3oGhGep2Ov04hzbXj2mXpUjh6MloMh1wvdY0+Wrdi8x/IeSUtMtvqvSm3Xvh7R8xRrLqQ/W3I9pxkquvroVmhwJlP0ffVDKedpHHljw7vwU85POMpcZgnCrMqdLTqcN+zanKpj2227wyJuSWHFwEZMoJFzcSzKg83e98TV8o/84Sh4vXKOeRRAmltNYLse5n3NzL39tS6N4t1l7jJpVCHiGmOTgDhD/5BUG0xI5mSpFXzMn3A1vDlH3FvrFnMr5XIdRLCTzC3vZmv/W5jA9QPg/hKPtp5jeA40SuIMG7se3yFg4SOaULvdSTTzONhjps5+gD6SYDQWywOtRJ1rdlOnOiB5iNIgwv1FxQo/VE3m8SPFL1cH6VBtSPztb24F/bcvJZ9cPf7UygbjpWf99y5NeSqjlB1o1xQm4Qu2uTgoLezqhaytPOftAX1rAwCHqvL91oRUJOmw+b5DU+/2YrgRjGRaHPzLf9UVgwmE4qomX9adYtfrktLqqJFVxLUFw8FldliLkD7uM0D/BjATgIkE9fxuaalhXhpWRCr2mt44MR6ChUUp/z4QNEA4fS2vXlZJ2ZhZ996XWDw4gBHw= X-MS-TrafficTypeDiagnostic: AM6PR03MB5047: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /4FWQgdD8+vd38XQgQCHjTgDFBA8otDfz4ctfCDvWGULV/Sw56QlWNvdjNudq0cAz/tjBozcVv62X4nD8f7wUyYc1tnp/rHRU7/Pb8y+ZPTZr58vjCPRPumHPYgxDxkzxGxrsW8ScSojQPk2/yA+EjLqV+GpB3EJFsyz7bvDnC6BH0PaY2wXvoDFSIr5v5fSAiFZkukej84WASttzGuYno3s3m5R8T3GP6YFw2SRpmWjMIDsNwGUOqMnqGIKtY1SbJfKJw9TxibdEXAEIUpT/mpmoBq/6pFbaPRD3eYfcjDCi7Tdf4JbdXR20PIQkFmgcz5jXl0RQgrE3fYNX9o7jHH6S6RQ8uslnb9pPnLI2VdRVTBuwuONI9XEMpznFuZvnHPCz2Nra8qEBmZpuSjsNmz9c9VpVCrIQUGX9U/NzfUYoDmsx1/GemMQcVU9Hp+o X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o5JIePjNaJInHyf9M9PTRiaq43cdh4yExyI3lg2WZ5M0ByY3vn+t9mcmxOxBm4wMub6aiWfmt882G9cy8AQGRj/Pza9uN0dX49q/cxWzzv8xNi+edzmDXzovqXVYxpnBUzYCwkOGinDWp5Dlfi7abg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a44dde2d-4601-4e24-bb9d-08d9757daeac 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:31.3564 (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 06/39] avfilter/af_asupercut: 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: OuGV/AdAnAWm Signed-off-by: Andreas Rheinhardt --- libavfilter/af_asupercut.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavfilter/af_asupercut.c b/libavfilter/af_asupercut.c index bd8b1cf44a..29f24c7055 100644 --- a/libavfilter/af_asupercut.c +++ b/libavfilter/af_asupercut.c @@ -399,15 +399,15 @@ static const AVOption asuperpass_asuperstop_options[] = { { NULL } }; -#define asuperpass_options asuperpass_asuperstop_options -AVFILTER_DEFINE_CLASS(asuperpass); +AVFILTER_DEFINE_CLASS_EXT(asuperpass_asuperstop, "asuperpass/asuperstop", + asuperpass_asuperstop_options); const AVFilter ff_af_asuperpass = { .name = "asuperpass", .description = NULL_IF_CONFIG_SMALL("Apply high order Butterworth band-pass filter."), + .priv_class = &asuperpass_asuperstop_class, .query_formats = query_formats, .priv_size = sizeof(ASuperCutContext), - .priv_class = &asuperpass_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs), @@ -416,15 +416,12 @@ const AVFilter ff_af_asuperpass = { AVFILTER_FLAG_SLICE_THREADS, }; -#define asuperstop_options asuperpass_asuperstop_options -AVFILTER_DEFINE_CLASS(asuperstop); - const AVFilter ff_af_asuperstop = { .name = "asuperstop", .description = NULL_IF_CONFIG_SMALL("Apply high order Butterworth band-stop filter."), + .priv_class = &asuperpass_asuperstop_class, .query_formats = query_formats, .priv_size = sizeof(ASuperCutContext), - .priv_class = &asuperstop_class, .uninit = uninit, FILTER_INPUTS(inputs), FILTER_OUTPUTS(outputs),