From patchwork Mon Sep 13 23:23:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30227 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4466480iov; Mon, 13 Sep 2021 16:24:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxF0eZLDqBfbkMRMO+11/mV7AI0q9D6/zfelEJcD6fdSjgd2gndorPISdMW+TiG7vIzBd9V X-Received: by 2002:a05:6402:cae:: with SMTP id cn14mr6521136edb.212.1631575463954; Mon, 13 Sep 2021 16:24:23 -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 o1si12298083ejy.319.2021.09.13.16.24.00; Mon, 13 Sep 2021 16:24:23 -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=Y6Je4dfP; 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 5E8A568A79F; Tue, 14 Sep 2021 02:23:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071028.outbound.protection.outlook.com [40.92.71.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9234768AA7B for ; Tue, 14 Sep 2021 02:23:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eB/B7HPtV/sXTYu62x1QFPQOuPDWag9lunfAQ3QpczrbBJLB7pneQUAUvtDfTixJ4SPEGSXo1st1o4X2bk5AigyAyJ6l6NhY4+Lyl7yigpfLeGR3TcNU4Tk79gHVt9NOsHepU8nzonrIQ8Ta7vr/9yHW0da2L2OKhCSY1wDfERG/bm14dlnZ6UXjklSTIXFika3SHktqH6JqjN+pcJ20Bhj3mtnc5leG5Ux2ANiv/bNG7kUNg9v8LeyDwG9RJgCPMHxEgEdvSEAucgI2ebeHQ18yKKdAFvGEoA/F36/drNDirsYoro2t34zYUj7JmEivwoCurDxeHDl6eu7lZrqHiw== 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=3GuOoEzLoKh+0MM9Aef+dDcuEOUbn+STa7lokrDwmSw=; b=anMXlhRUM/bRGz3+MKaa739fNuqk7r0dCJv5b4nytfRpqRtYRJMDFmo5eEZw/dB2our1mOp0NaKxJI4rwLe0UKvFPKhfH4O2+YTcoHVIrVM7VH196QnfLLQIht5z8MShTMwinlq8tz70GSemU5GQ6sn5lY7ZDiwjMliYUo3SDB872/piRu8CQkH4gVQRrLR3pVXZhh2Xg7yA6368TlEzTgAJwpXu4ICiktOwQdkKlmozyQNcoIPnTKKMBW5YLnM73M/Vukm2BW8iOgwJEEhFLbK7aS9RCUBQ2BK1IdhFdL/OKYuiZfsxomXavq3UhEDSnjnfYnVnsDq7h3cEV5YLaQ== 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=3GuOoEzLoKh+0MM9Aef+dDcuEOUbn+STa7lokrDwmSw=; b=Y6Je4dfP3j61ByejVHyQAyzxET24NKJPq/ymPDYKXJxu/4MyuFpY4A1V+pc+ALKCuDmHjX1iJ/7vtMnx1ba2K3J2PS9l/E0mCrC7KtK6i64QofzjRTfDaX4YQkJpkdTD5m/hQlzr+i5r7TFzkmbFUrGWeKozdOUruzJGA1/9rzCE5UtwoihGHeuwxoIaubdAfp/Y/9aTH0Ma06vn+M7QgpmPTSaXMimfeOL7QVHO2QpbZ/krxja6zRv9HmQjjA6Dq2MnA8FFfrfZOR0Cd8jEksdwjHPsT+46+rSeBHN+NzDIvYlDn5esy34AAA4vHIOm69Js+WLCm0QSwO+HCNt6/w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4216.eurprd03.prod.outlook.com (2603:10a6:20b:d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.18; Mon, 13 Sep 2021 23:23:47 +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.019; Mon, 13 Sep 2021 23:23:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 01:23:27 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [gK1qrYygD1+zhFbiJ5c23L0wZEUfoAXD] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913232339.3115725-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 23:23:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6a75a35c-5b5b-4c77-cf55-08d9770d898e X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3V/TtV3mrfogUCq4JsxaBxFUrzSLOzwGNTN4KOmw6dokqKdthFhwaxwOa7foDRXHzTyDRLZX6w5dd8j3n+u75gTZJf+2J5fTLmZGR5z0dZx6/JbklcKlw/bHgBvjBVl/7sJ/YqF9Fp3D291uqDLCSRJw3dtqBkhpJa5QpHqqh9rSi1Zvwsol3Idu+hVzlROYlqTtEAljmoiv2AECgD63/nCXTS9C9+K84sDJIO/E+5kOX3965JSk8lF3qErEFzGZ+DkQ5QOd50EmxVoAA3840rZ6Oq9qAwS4sJa2/BrR/bNKZjAQpERabxb8tls8gsNzUXDfAtWMuOS9ke2VzjdpIB6+ol0BYHeLraYRzcqxuQO8MDvVuvSknhlFc2zPo4IrzttjG5ndzpivrxY4IiuIhBTnowsVv98e/HpNyIFMMF87N44ZnWuupc5SacY0kmA6hCVGieJ8oogWEOPmAcazvg2ibQ702bqE9fljNrkDd2jCqpPMrWsWmevC5gkQCBRT+kCt0u+OQl3qW3EdNfLtqsO8xO+Q7vB/RzYJ3T8Kt0wNJBlckA0A54yzE97DURM5hmA+GDaT6oR5HDyLZvnKXI+0ltWfyIJITRQ1R14ITqZqub5CL3rQ5PwhIVhN1o+Gi0BP33gjFPfxDtA+r5iyEOcx0ZYAUcv+wytFITDfZpsRXww8sHSLpZyrm4Q7EKiLrPuQxqpH3U12sCAFSSJDHw5ZDDicC+4MfM= X-MS-TrafficTypeDiagnostic: AM6PR03MB4216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fpb7dZeA7QHNdMdOHWbZqFDdJeCpvVIwvHGcIhje+6AJSJPBLsrdDH/p6wK6MMSxb2zRofdsZVzQ5PRqzlEZT2PcW76SOMGULELfviyI6JYJzz1lv0TD0BSMsJC5x/9eRp4skZUH2iP0oHw0bmISlXJd7yuGtU0LQY2Znr6uAMV2wdaVi6iqht8zm8asW1XmFosqAGOTZa0/iggXAD7P8vM3UcdnHfhMiTLRzdf8SnH8AWLgcZr9w6Hb1lAHl39ZFP0DKQEkqRCZ/cSEmVhax2EcOvclzZVEWwQZxR4/bcDrkfucSICIPDrm/UetbxCDT1H5BUfBC0V8bNazuEg+v0GtLTQU9T29LFeKDaWFcaeJohQ3xbyA8lW9L94aDCAAvifkQVJa1QLW+DhsCHuuSB+XpznnPJdeGm2RB8AYKCWfg7gOB65Kmkr2OdPWtM39 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qG2zNkrpeM6JCPeQIU8TJ3lMTsL9Zd98662PJ5JcGZWKo52pbj0UD4eww20EBKSjgta5lYI4vqmvZME1twC5m3OM8xQhGHLwfx3lZPYFG4kB/tTvrdkxRqKe6wr0RM4eZ4v/vOtRcoh28NS9OYySeA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a75a35c-5b5b-4c77-cf55-08d9770d898e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 23:23:47.8053 (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: AM6PR03MB4216 Subject: [FFmpeg-devel] [PATCH v2 02/14] avfilter/vf_scale: 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: jnd4h0Nz+gwl Signed-off-by: Andreas Rheinhardt --- This one is new. libavfilter/vf_scale.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 6c7f4dc9ab..a1902a13cf 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -967,7 +967,7 @@ static const AVOption scale_options[] = { }; static const AVClass scale_class = { - .class_name = "scale", + .class_name = "scale(2ref)", .item_name = av_default_item_name, .option = scale_options, .version = LIBAVUTIL_VERSION_INT, @@ -1004,15 +1004,6 @@ const AVFilter ff_vf_scale = { .process_command = process_command, }; -static const AVClass scale2ref_class = { - .class_name = "scale2ref", - .item_name = av_default_item_name, - .option = scale_options, - .version = LIBAVUTIL_VERSION_INT, - .category = AV_CLASS_CATEGORY_FILTER, - .child_class_iterate = child_class_iterate, -}; - static const AVFilterPad avfilter_vf_scale2ref_inputs[] = { { .name = "default", @@ -1048,7 +1039,7 @@ const AVFilter ff_vf_scale2ref = { .uninit = uninit, .query_formats = query_formats, .priv_size = sizeof(ScaleContext), - .priv_class = &scale2ref_class, + .priv_class = &scale_class, FILTER_INPUTS(avfilter_vf_scale2ref_inputs), FILTER_OUTPUTS(avfilter_vf_scale2ref_outputs), .process_command = process_command,