aboutsummaryrefslogtreecommitdiffstats
path: root/ffplay.c
diff options
context:
space:
mode:
authorJeff Downs <heydowns@somuchpressure.net>2011-06-29 12:38:46 -0400
committerJeff Downs <heydowns@somuchpressure.net>2011-06-30 11:49:48 -0400
commita09918335f1305e2d6bf6a9b0001ac5f167c1aea (patch)
tree9325d8def01a08f34eeeb7ea70f79eff56919add /ffplay.c
parent5a931a158fbe2ea413dcf28c43c4d6bace3514a1 (diff)
downloadffmpeg-a09918335f1305e2d6bf6a9b0001ac5f167c1aea.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 8788771491..599b288529 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;
@@ -2950,7 +2950,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();
@@ -2982,6 +2982,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 */