Merge remote-tracking branch 'qatar/master'

[ffmpeg] / cmdutils.c

diff --git a/cmdutils.c b/cmdutils.c
index 09a5ce139c2b88878c4cecb60ffe1908ef802aba..ee42fea37159ec1482524ef81da88271cd52845d 100644 (file)
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -547,8 +547,6 @@ int opt_default(void *optctx, const char *opt, const char *arg)
 
     if (consumed)
         return 0;
-    av_log(NULL, AV_LOG_ERROR, "Could not find option '%s' in any of the FFmpeg subsystems "
-           "(codec, format, scaler, resampler contexts)\n", opt);
     return AVERROR_OPTION_NOT_FOUND;
 }
 
@@ -1615,6 +1613,7 @@ static void show_help_muxer(const char *name)
 
 static void show_help_filter(const char *name)
 {
+#if CONFIG_AVFILTER
     const AVFilter *filter;
 
     if (!name) {
@@ -1633,6 +1632,10 @@ static void show_help_filter(const char *name)
         show_help_children(filter->priv_class, AV_OPT_FLAG_FILTERING_PARAM);
     else
         printf("No AVOption available\n");
+#else
+    av_log(NULL, AV_LOG_ERROR, "Build without libavfilter; "
+           "can not to satisfy request\n");
+#endif
 }
 
 int show_help(void *optctx, const char *opt, const char *arg)