aboutsummaryrefslogtreecommitdiffstats
path: root/ffplay.c
diff options
context:
space:
mode:
authorJeff Downs <heydowns@somuchpressure.net>2011-06-29 12:38:46 -0400
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-09-07 08:56:04 +0200
commit7d704f5127c8163a04026e3f53d082505c92c851 (patch)
tree8ff8fa82583c0550a8b325e3114fc9c4e04ab175 /ffplay.c
parenteb975b1c8bfc0d881479a5ba5c4ace4122191687 (diff)
downloadffmpeg-7d704f5127c8163a04026e3f53d082505c92c851.tar.gz
Make all option parsing functions match the function pointer type through which they are called.
All option parsing functions now match the function pointer signature through which they are called (int f(const char *, const char *), thereby working reliably on all platforms. Prefix all option processing functions with opt_
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ffplay.c b/ffplay.c
index 6eefee6e00..6ac8f34fa0 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -212,7 +212,7 @@ typedef struct VideoState {
int refresh;
} VideoState;
-static void show_help(void);
+static int opt_help(const char *opt, const char *arg);
/* options specified by the user */
static AVInputFormat *file_iformat;
@@ -2952,7 +2952,7 @@ static void show_usage(void)
printf("\n");
}
-static void show_help(void)
+static int opt_help(const char *opt, const char *arg)
{
av_log_set_callback(log_callback_help);
show_usage();
@@ -2984,6 +2984,7 @@ 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;
}
/* Called from the main */