[FFmpeg-cvslog] avfilter/f_graphmonitor: Deduplicate outputs

Andreas Rheinhardt git at videolan.org
Sat Nov 4 02:36:16 EET 2023


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Wed Nov  1 08:35:44 2023 +0100| [a40f833bac72866dfc48de56d31432e27e7075dd] | committer: Andreas Rheinhardt

avfilter/f_graphmonitor: Deduplicate outputs

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

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

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

diff --git a/libavfilter/f_graphmonitor.c b/libavfilter/f_graphmonitor.c
index ce4153fc79..d2c0ae81bf 100644
--- a/libavfilter/f_graphmonitor.c
+++ b/libavfilter/f_graphmonitor.c
@@ -568,8 +568,6 @@ static av_cold void uninit(AVFilterContext *ctx)
 
 AVFILTER_DEFINE_CLASS_EXT(graphmonitor, "(a)graphmonitor", graphmonitor_options);
 
-#if CONFIG_GRAPHMONITOR_FILTER
-
 static const AVFilterPad graphmonitor_outputs[] = {
     {
         .name         = "default",
@@ -578,6 +576,8 @@ static const AVFilterPad graphmonitor_outputs[] = {
     },
 };
 
+#if CONFIG_GRAPHMONITOR_FILTER
+
 const AVFilter ff_vf_graphmonitor = {
     .name          = "graphmonitor",
     .description   = NULL_IF_CONFIG_SMALL("Show various filtergraph stats."),
@@ -596,14 +596,6 @@ const AVFilter ff_vf_graphmonitor = {
 
 #if CONFIG_AGRAPHMONITOR_FILTER
 
-static const AVFilterPad agraphmonitor_outputs[] = {
-    {
-        .name         = "default",
-        .type         = AVMEDIA_TYPE_VIDEO,
-        .config_props = config_output,
-    },
-};
-
 const AVFilter ff_avf_agraphmonitor = {
     .name          = "agraphmonitor",
     .description   = NULL_IF_CONFIG_SMALL("Show various filtergraph stats."),
@@ -613,7 +605,7 @@ const AVFilter ff_avf_agraphmonitor = {
     .uninit        = uninit,
     .activate      = activate,
     FILTER_INPUTS(ff_audio_default_filterpad),
-    FILTER_OUTPUTS(agraphmonitor_outputs),
+    FILTER_OUTPUTS(graphmonitor_outputs),
     FILTER_QUERY_FUNC(query_formats),
     .process_command = ff_filter_process_command,
 };



More information about the ffmpeg-cvslog mailing list