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 /cmdutils_common_opts.h | |
| 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 'cmdutils_common_opts.h')
| -rw-r--r-- | cmdutils_common_opts.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/cmdutils_common_opts.h b/cmdutils_common_opts.h index 3fb74d6839..f3bb415adf 100644 --- a/cmdutils_common_opts.h +++ b/cmdutils_common_opts.h @@ -1,22 +1,22 @@ - { "L", OPT_EXIT, {(void*)opt_license}, "show license" }, - { "h", OPT_EXIT, {(void*)opt_help}, "show help" }, - { "?", OPT_EXIT, {(void*)opt_help}, "show help" }, - { "help", OPT_EXIT, {(void*)opt_help}, "show help" }, - { "-help", OPT_EXIT, {(void*)opt_help}, "show help" }, - { "version", OPT_EXIT, {(void*)opt_version}, "show version" }, - { "formats" , OPT_EXIT, {(void*)opt_formats }, "show available formats" }, - { "codecs" , OPT_EXIT, {(void*)show_codecs }, "show available codecs" }, - { "decoders" , OPT_EXIT, {(void*)show_decoders }, "show available decoders" }, - { "encoders" , OPT_EXIT, {(void*)show_encoders }, "show available encoders" }, - { "bsfs" , OPT_EXIT, {(void*)opt_bsfs }, "show available bit stream filters" }, - { "protocols", OPT_EXIT, {(void*)opt_protocols}, "show available protocols" }, - { "filters", OPT_EXIT, {(void*)opt_filters }, "show available filters" }, - { "pix_fmts" , OPT_EXIT, {(void*)opt_pix_fmts }, "show available pixel formats" }, + { "L" , OPT_EXIT, {.func_arg = show_license}, "show license" }, + { "h" , OPT_EXIT, {.func_arg = show_help}, "show help" }, + { "?" , OPT_EXIT, {.func_arg = show_help}, "show help" }, + { "help" , OPT_EXIT, {.func_arg = show_help}, "show help" }, + { "-help" , OPT_EXIT, {.func_arg = show_help}, "show help" }, + { "version" , OPT_EXIT, {.func_arg = show_version}, "show version" }, + { "formats" , OPT_EXIT, {.func_arg = show_formats }, "show available formats" }, + { "codecs" , OPT_EXIT, {.func_arg = show_codecs }, "show available codecs" }, + { "decoders" , OPT_EXIT, {.func_arg = show_decoders }, "show available decoders" }, + { "encoders" , OPT_EXIT, {.func_arg = show_encoders }, "show available encoders" }, + { "bsfs" , OPT_EXIT, {.func_arg = show_bsfs }, "show available bit stream filters" }, + { "protocols" , OPT_EXIT, {.func_arg = show_protocols}, "show available protocols" }, + { "filters" , OPT_EXIT, {.func_arg = show_filters }, "show available filters" }, + { "pix_fmts" , OPT_EXIT, {.func_arg = show_pix_fmts }, "show available pixel formats" }, { "sample_fmts", OPT_EXIT, {.func_arg = show_sample_fmts }, "show available audio sample formats" }, - { "loglevel", HAS_ARG, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" }, - { "v", HAS_ARG, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" }, - { "debug", HAS_ARG, {(void*)opt_codec_debug}, "set debug flags", "flags" }, - { "fdebug", HAS_ARG, {(void*)opt_codec_debug}, "set debug flags", "flags" }, - { "report", 0, {(void*)opt_report}, "generate a report" }, - { "max_alloc", HAS_ARG, {(void*)opt_max_alloc}, "set maximum size of a single allocated block", "bytes" }, - { "cpuflags", HAS_ARG | OPT_EXPERT, {(void*)opt_cpuflags}, "force specific cpu flags", "flags" }, + { "loglevel" , HAS_ARG, {.func_arg = opt_loglevel}, "set libav* logging level", "loglevel" }, + { "v", HAS_ARG, {.func_arg = opt_loglevel}, "set libav* logging level", "loglevel" }, + { "debug" , HAS_ARG, {.func_arg = opt_codec_debug}, "set debug flags", "flags" }, + { "fdebug" , HAS_ARG, {.func_arg = opt_codec_debug}, "set debug flags", "flags" }, + { "report" , 0, {(void*)opt_report}, "generate a report" }, + { "max_alloc" , HAS_ARG, {.func_arg = opt_max_alloc}, "set maximum size of a single allocated block", "bytes" }, + { "cpuflags" , HAS_ARG | OPT_EXPERT, {.func_arg = opt_cpuflags}, "force specific cpu flags", "flags" }, |