summaryrefslogtreecommitdiff
path: root/avconv_opt.c
diff options
context:
space:
mode:
Diffstat (limited to 'avconv_opt.c')
-rw-r--r--avconv_opt.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/avconv_opt.c b/avconv_opt.c
index ac1a65ecfb..ef591a462a 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -1789,10 +1789,10 @@ static int opt_filter_complex(const char *opt, const char *arg)
return 0;
}
-static int show_help(const char *opt, const char *arg)
+void show_help_default(const char *opt, const char *arg)
{
int flags = AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM;
- av_log_set_callback(log_callback_help);
+
show_usage();
show_help_options(options, "Main options:",
0, OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE);
@@ -1812,7 +1812,6 @@ static int show_help(const char *opt, const char *arg)
show_help_children(avcodec_get_class(), flags);
show_help_children(avformat_get_class(), flags);
show_help_children(sws_get_class(), flags);
- return 0;
}
void show_usage(void)