[FFmpeg-cvslog] avfilter/vf_premultiply: Deduplicate AVClasses

Andreas Rheinhardt git at videolan.org
Sun Sep 19 06:14:12 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri Sep 10 22:59:18 2021 +0200| [56d3e840f612dcf1980cf66cb388ace93c567ae5] | committer: Andreas Rheinhardt

avfilter/vf_premultiply: Deduplicate AVClasses

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56d3e840f612dcf1980cf66cb388ace93c567ae5
---

 libavfilter/vf_premultiply.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/libavfilter/vf_premultiply.c b/libavfilter/vf_premultiply.c
index 70a5bf3b11..a76c08405c 100644
--- a/libavfilter/vf_premultiply.c
+++ b/libavfilter/vf_premultiply.c
@@ -60,8 +60,7 @@ static const AVOption options[] = {
     { NULL }
 };
 
-#define premultiply_options options
-AVFILTER_DEFINE_CLASS(premultiply);
+AVFILTER_DEFINE_CLASS_EXT(premultiply, "(un)premultiply", options);
 
 static int query_formats(AVFilterContext *ctx)
 {
@@ -843,12 +842,10 @@ const AVFilter ff_vf_premultiply = {
 
 #if CONFIG_UNPREMULTIPLY_FILTER
 
-#define unpremultiply_options options
-AVFILTER_DEFINE_CLASS(unpremultiply);
-
 const AVFilter ff_vf_unpremultiply = {
     .name          = "unpremultiply",
     .description   = NULL_IF_CONFIG_SMALL("UnPreMultiply first stream with first plane of second stream."),
+    .priv_class    = &premultiply_class,
     .priv_size     = sizeof(PreMultiplyContext),
     .init          = init,
     .uninit        = uninit,
@@ -856,7 +853,6 @@ const AVFilter ff_vf_unpremultiply = {
     .activate      = activate,
     .inputs        = NULL,
     FILTER_OUTPUTS(premultiply_outputs),
-    .priv_class    = &unpremultiply_class,
     .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL |
                      AVFILTER_FLAG_DYNAMIC_INPUTS |
                      AVFILTER_FLAG_SLICE_THREADS,



More information about the ffmpeg-cvslog mailing list