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 /ffprobe.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 'ffprobe.c')
| -rw-r--r-- | ffprobe.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3379,7 +3379,7 @@ DEFINE_OPT_SHOW_SECTION(streams, STREAMS) DEFINE_OPT_SHOW_SECTION(programs, PROGRAMS) static const OptionDef real_options[] = { -#include "cmdutils_common_opts.h" + CMDUTILS_COMMON_OPTIONS { "f", HAS_ARG, {.func_arg = opt_format}, "force format", "format" }, { "unit", OPT_BOOL, {&show_value_unit}, "show unit of the displayed values" }, { "prefix", OPT_BOOL, {&use_value_prefix}, "use SI prefixes for the displayed values" }, |