diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 17:03:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 17:06:50 +0200 |
| commit | aee51039ee204197fdb4c924f8ee433b803ab1e1 (patch) | |
| tree | b1138f704eec5bf82e6fcc23591c7b245f728ac5 /ffmpeg_opt.c | |
| parent | 67a6dac7c18caecb418f7590a484dcbfcad869ab (diff) | |
| parent | f8b1e665539010d3ca148f09cb1203c20c1ca174 (diff) | |
| download | ffmpeg-aee51039ee204197fdb4c924f8ee433b803ab1e1.tar.gz | |
Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'
* commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174':
avconv: print info/capabilities options in a separate help group.
avtools: add -h demuxer/muxer
cmdutils: extend -h to allow printing codec details.
Conflicts:
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffserver.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index aba9a1b6ff..02137b9bff 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -2139,13 +2139,16 @@ static int opt_filter_complex(const char *opt, const char *arg) return 0; } -static int show_help(const char *opt, const char *arg) +void show_help_default(const char *opt, const char *arg) { int flags = AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM; - av_log_set_callback(log_callback_help); + show_usage(); + show_help_options(options, "Print help / information / capabilities:", + OPT_EXIT, 0); show_help_options(options, "Main options:", - 0, OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE); + 0, OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | + OPT_EXIT); show_help_options(options, "Advanced options:", OPT_EXPERT, OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE); show_help_options(options, "Video options:", @@ -2164,7 +2167,6 @@ static int show_help(const char *opt, const char *arg) show_help_children(sws_get_class(), flags); show_help_children(swr_get_class(), AV_OPT_FLAG_AUDIO_PARAM); show_help_children(avfilter_get_class(), AV_OPT_FLAG_FILTERING_PARAM); - return 0; } void show_usage(void) |