summaryrefslogtreecommitdiff
path: root/ffprobe.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 /ffprobe.c
parent5a931a158fbe2ea413dcf28c43c4d6bace3514a1 (diff)
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 'ffprobe.c')
-rw-r--r--ffprobe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffprobe.c b/ffprobe.c
index a2b27c3745..fdcdf70273 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -353,7 +353,7 @@ static int opt_input_file(const char *opt, const char *arg)
return 0;
}
-static void show_help(void)
+static int opt_help(const char *opt, const char *arg)
{
av_log_set_callback(log_callback_help);
show_usage();
@@ -361,6 +361,7 @@ static void show_help(void)
printf("\n");
av_opt_show2(avformat_opts, NULL,
AV_OPT_FLAG_DECODING_PARAM, 0);
+ return 0;
}
static void opt_pretty(void)