Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'

[ffmpeg] / cmdutils.c

diff --git a/cmdutils.c b/cmdutils.c
index 1634947b207faa78e94ec1e02f86d9c5d1c3ec8a..36a80c67402b3095edb90d28199fdb48cc770e2f 100644 (file)
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -474,7 +474,9 @@ int opt_default(void *optctx, const char *opt, const char *arg)
     char opt_stripped[128];
     const char *p;
     const AVClass *cc = avcodec_get_class(), *fc = avformat_get_class();
-    const av_unused AVClass *rc_class;
+#if CONFIG_AVRESAMPLE
+    const AVClass *rc = avresample_get_class();
+#endif
     const AVClass *sc, *swr_class;
 
     if (!strcmp(opt, "debug") || !strcmp(opt, "fdebug"))
@@ -527,8 +529,7 @@ int opt_default(void *optctx, const char *opt, const char *arg)
     }
 #endif
 #if CONFIG_AVRESAMPLE
-    rc_class = avresample_get_class();
-    if ((o=av_opt_find(&rc_class, opt, NULL, 0,
+    if ((o=av_opt_find(&rc, opt, NULL, 0,
                        AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) {
         av_dict_set(&resample_opts, opt, arg, FLAGS);
         consumed = 1;