aboutsummaryrefslogtreecommitdiffstats
path: root/avplay.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 /avplay.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 'avplay.c')
-rw-r--r--avplay.c6
1 files changed, 4 insertions, 2 deletions
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)