From f617135bc94df0eff6bc5228f6a6430ce160162a Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 11 Aug 2012 16:13:54 +0200 Subject: 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*). --- avplay.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'avplay.c') diff --git a/avplay.c b/avplay.c index 3f2c4256c2..593b38af66 100644 --- a/avplay.c +++ b/avplay.c @@ -224,7 +224,7 @@ typedef struct VideoState { int refresh; } VideoState; -static void show_help(void); +static int show_help(const char *opt, const char *arg); /* options specified by the user */ static AVInputFormat *file_iformat; @@ -2922,7 +2922,7 @@ static void show_usage(void) printf("\n"); } -static void show_help(void) +static int show_help(const char *opt, const char *arg) { av_log_set_callback(log_callback_help); show_usage(); @@ -2949,6 +2949,8 @@ static void show_help(void) "down/up seek backward/forward 1 minute\n" "mouse click seek to percentage in file corresponding to fraction of width\n" ); + + return 0; } static void opt_input_file(void *optctx, const char *filename) -- cgit v1.2.3