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 /ffplay.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 'ffplay.c')
| -rw-r--r-- | ffplay.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3512,7 +3512,7 @@ static int opt_codec(void *optctx, const char *opt, const char *arg) static int dummy; static const OptionDef options[] = { -#include "cmdutils_common_opts.h" + CMDUTILS_COMMON_OPTIONS { "x", HAS_ARG, { .func_arg = opt_width }, "force displayed width", "width" }, { "y", HAS_ARG, { .func_arg = opt_height }, "force displayed height", "height" }, { "s", HAS_ARG | OPT_VIDEO, { .func_arg = opt_frame_size }, "set frame size (WxH or abbreviation)", "size" }, |