aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver.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:48:38 +0200
commit7b6b9be8614aa53e79db565c9203b9afaa452d8d (patch)
treed5b2e8755ab6371f3fe26b9a1d04fc309dfa0ba3 /ffserver.c
parent374409eb1a640abde877bb55d2e8a1e65083699a (diff)
downloadffmpeg-7b6b9be8614aa53e79db565c9203b9afaa452d8d.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 'ffserver.c')
-rw-r--r--ffserver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c
index 0eac639137..2aa778f823 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -4662,12 +4662,13 @@ static void opt_debug(void)
logfilename[0] = '-';
}
-static void show_help(void)
+static int opt_help(const char *opt, const char *arg)
{
printf("usage: ffserver [options]\n"
"Hyper fast multi format Audio/Video streaming server\n");
printf("\n");
show_help_options(options, "Main options:\n", 0, 0);
+ return 0;
}
static const OptionDef options[] = {