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 /ffmpeg_opt.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 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index e73a61059f..ce85f324cf 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -3291,7 +3291,7 @@ static int opt_progress(void *optctx, const char *opt, const char *arg) #define OFFSET(x) offsetof(OptionsContext, x) const OptionDef options[] = { /* main options */ -#include "cmdutils_common_opts.h" + CMDUTILS_COMMON_OPTIONS { "f", HAS_ARG | OPT_STRING | OPT_OFFSET | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(format) }, "force format", "fmt" }, |