[FFmpeg-devel] [PATCH 17/38] avfilter/src_movie: Deduplicate AVClasses

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 libavfilter/src_movie.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index 0d63c1e4bc..27b17c6a9d 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -630,9 +630,9 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar
     return ret;
 }
 
-#if CONFIG_MOVIE_FILTER
+AVFILTER_DEFINE_CLASS_EXT(movie, "(a)movie", movie_options);
 
-AVFILTER_DEFINE_CLASS(movie);
+#if CONFIG_MOVIE_FILTER
 
 const AVFilter ff_avsrc_movie = {
     .name          = "movie",
@@ -653,12 +653,10 @@ const AVFilter ff_avsrc_movie = {
 
 #if CONFIG_AMOVIE_FILTER
 
-#define amovie_options movie_options
-AVFILTER_DEFINE_CLASS(amovie);
-
 const AVFilter ff_avsrc_amovie = {
     .name          = "amovie",
     .description   = NULL_IF_CONFIG_SMALL("Read audio from a movie source."),
+    .priv_class    = &movie_class,
     .priv_size     = sizeof(MovieContext),
     .init          = movie_common_init,
     .uninit        = movie_uninit,
@@ -666,7 +664,6 @@ const AVFilter ff_avsrc_amovie = {
 
     .inputs     = NULL,
     .outputs    = NULL,
-    .priv_class = &amovie_class,
     .flags      = AVFILTER_FLAG_DYNAMIC_OUTPUTS,
     .process_command = process_command,
 };
-- 
2.30.2