[FFmpeg-cvslog] avfilter/f_graphmonitor: Deduplicate AVClasses

Andreas Rheinhardt git at videolan.org
Sun Sep 19 06:13:42 EEST 2021


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

avfilter/f_graphmonitor: Deduplicate AVClasses

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

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

 libavfilter/f_graphmonitor.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libavfilter/f_graphmonitor.c b/libavfilter/f_graphmonitor.c
index b712c2fdd6..de91a863c2 100644
--- a/libavfilter/f_graphmonitor.c
+++ b/libavfilter/f_graphmonitor.c
@@ -386,9 +386,9 @@ static int config_output(AVFilterLink *outlink)
     return 0;
 }
 
-#if CONFIG_GRAPHMONITOR_FILTER
+AVFILTER_DEFINE_CLASS_EXT(graphmonitor, "(a)graphmonitor", graphmonitor_options);
 
-AVFILTER_DEFINE_CLASS(graphmonitor);
+#if CONFIG_GRAPHMONITOR_FILTER
 
 static const AVFilterPad graphmonitor_inputs[] = {
     {
@@ -420,9 +420,6 @@ const AVFilter ff_vf_graphmonitor = {
 
 #if CONFIG_AGRAPHMONITOR_FILTER
 
-#define agraphmonitor_options graphmonitor_options
-AVFILTER_DEFINE_CLASS(agraphmonitor);
-
 static const AVFilterPad agraphmonitor_inputs[] = {
     {
         .name = "default",
@@ -441,8 +438,8 @@ static const AVFilterPad agraphmonitor_outputs[] = {
 const AVFilter ff_avf_agraphmonitor = {
     .name          = "agraphmonitor",
     .description   = NULL_IF_CONFIG_SMALL("Show various filtergraph stats."),
+    .priv_class    = &graphmonitor_class,
     .priv_size     = sizeof(GraphMonitorContext),
-    .priv_class    = &agraphmonitor_class,
     .query_formats = query_formats,
     .activate      = activate,
     FILTER_INPUTS(agraphmonitor_inputs),



More information about the ffmpeg-cvslog mailing list