aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver.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 /ffserver.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 'ffserver.c')
-rw-r--r--ffserver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c
index 15ea00f4f8..83dd986dc2 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -4654,12 +4654,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[] = {