summaryrefslogtreecommitdiff
path: root/avconv_opt.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-08-11 16:13:54 +0200
committerAnton Khirnov <anton@khirnov.net>2012-08-19 19:07:43 +0200
commitf617135bc94df0eff6bc5228f6a6430ce160162a (patch)
tree495461ae3080d110f885b3cb1e3a5dd7aa281a19 /avconv_opt.c
parent4855022aa11ec7aa1a3bd9797814e84795634abe (diff)
downloadffmpeg-f617135bc94df0eff6bc5228f6a6430ce160162a.tar.gz
avtools: fix show_foo() signatures.
show_foo() functions are declared as void show_foo(void), but called as int show_foo(const char*, const char*).
Diffstat (limited to 'avconv_opt.c')
-rw-r--r--avconv_opt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/avconv_opt.c b/avconv_opt.c
index dc44986e68..97ae0a4bf9 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -1760,7 +1760,7 @@ static int opt_filter_complex(const char *opt, const char *arg)
return 0;
}
-static void show_help(void)
+static int show_help(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);
@@ -1792,6 +1792,7 @@ static void show_help(void)
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)