diff mbox series

[FFmpeg-devel,v2,02/14] avfilter/vf_scale: Deduplicate AVClasses

Message ID AM7PR03MB6660FB65DDA8044535077D708FD99@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 403d8c01881b58f523ae20bf3a4dc831e2502fd2
Headers show
Series [FFmpeg-devel,v2,01/14] avfilter/vsrc_testsrc: Deduplicate AVClasses | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 13, 2021, 11:23 p.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
This one is new.

 libavfilter/vf_scale.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
diff mbox series

Patch

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,