diff mbox series

[FFmpeg-devel,11/39] avfilter/f_graphmonitor: Deduplicate AVClasses

Message ID AM7PR03MB666063F1035154A1A490E9248FD79@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 0eb1f45dd3c5a83600bd1a11bc780a4e0cecfe82
Headers show
Series [FFmpeg-devel,01/39] avfilter/vf_maskedminmax: Simplify init | 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. 11, 2021, 11:40 p.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavfilter/f_graphmonitor.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
diff mbox series

Patch

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),