diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 15:48:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 15:48:21 +0200 |
| commit | 927022a75372b9e127c490c8cd87f027c3957dc3 (patch) | |
| tree | 89cdb06c6861be36dfeccb833a7b14d1f0f6ad85 /ffserver.c | |
| parent | a5a0dedf111d6fd4fc41c3e82287f434c8f6c4d3 (diff) | |
| parent | d3810c47fe8c9509c28c65c0244e743c1d353daf (diff) | |
| download | ffmpeg-927022a75372b9e127c490c8cd87f027c3957dc3.tar.gz | |
Merge commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf'
* commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf':
avconv: get rid of ugly casts in the options table.
avconv: try to match codecs by codec descriptor name as a last resort.
avtools: fix show_foo() signatures.
Conflicts:
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
ffmpeg_opt.c
ffplay.c
ffprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c index a421e23ce3..51eb07a63e 100644 --- a/ffserver.c +++ b/ffserver.c @@ -4645,7 +4645,7 @@ static void opt_debug(void) logfilename[0] = '-'; } -static int opt_help(const char *opt, const char *arg) +static int show_help(const char *opt, const char *arg) { printf("usage: ffserver [options]\n" "Hyper fast multi format Audio/Video streaming server\n"); |