Merge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0'

* commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0': avconv: print filter options in -h full output. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <[email protected]>
linjiansheng · Apr 12, 2013 · f81a8e8 · f81a8e8
2 parents 7b6c0bd + dc57465
commit f81a8e8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
@@ -2433,7 +2433,7 @@ void show_help_default(const char *opt, const char *arg)
         show_help_children(avformat_get_class(), flags);
         show_help_children(sws_get_class(), flags);
         show_help_children(swr_get_class(), AV_OPT_FLAG_AUDIO_PARAM);
-        show_help_children(avfilter_get_class(), AV_OPT_FLAG_FILTERING_PARAM);
+        show_help_children(avfilter_get_class(), AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_FILTERING_PARAM);
     }
 }