diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 13:53:11 +0200 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 14:04:30 +0200 |
| commit | b010843594fee88a791185b83684e0e725007b7b (patch) | |
| tree | d8153bc6faa8472878362c8b35910be5fe42893d /ffserver.c | |
| parent | cea5e7355c58004605321295b7a506052292dbbc (diff) | |
| parent | 122de16dd8108a59a55d30543c9f28b5f61b02d1 (diff) | |
| download | ffmpeg-b010843594fee88a791185b83684e0e725007b7b.tar.gz | |
Merge commit '122de16dd8108a59a55d30543c9f28b5f61b02d1'
* commit '122de16dd8108a59a55d30543c9f28b5f61b02d1':
Replace cmdutils_common_opts.h by a macro
Merged-by: Clément Bœsch <cboesch@gopro.com>
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 8b819b6934..f9f987acac 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3950,7 +3950,7 @@ void show_help_default(const char *opt, const char *arg) } static const OptionDef options[] = { -#include "cmdutils_common_opts.h" + CMDUTILS_COMMON_OPTIONS { "n", OPT_BOOL, {(void *)&no_launch }, "enable no-launch mode" }, { "d", 0, {(void*)opt_debug}, "enable debug mode" }, { "f", HAS_ARG | OPT_STRING, {(void*)&config.filename }, "use configfile instead of /etc/ffserver.conf", "configfile" }, |