diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 19:03:04 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 19:06:50 +0400 |
commit | aee51039ee204197fdb4c924f8ee433b803ab1e1 (patch) | |
tree | b1138f704eec5bf82e6fcc23591c7b245f728ac5 /doc | |
parent | 67a6dac7c18caecb418f7590a484dcbfcad869ab (diff) | |
parent | f8b1e665539010d3ca148f09cb1203c20c1ca174 (diff) |
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 'doc')
-rw-r--r-- | doc/avtools-common-opts.texi | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi index 91460b30b2..805064c854 100644 --- a/doc/avtools-common-opts.texi +++ b/doc/avtools-common-opts.texi @@ -54,8 +54,29 @@ These options are shared amongst the av* tools. @item -L Show license. -@item -h, -?, -help, --help -Show help. +@item -h, -?, -help, --help [@var{arg}] +Show help. An optional parameter may be specified to print help about a specific +item. + +Possible values of @var{arg} are: +@table @option +@item decoder=@var{decoder_name} +Print detailed information about the decoder named @var{decoder_name}. Use the +@option{-decoders} option to get a list of all decoders. + +@item encoder=@var{encoder_name} +Print detailed information about the encoder named @var{encoder_name}. Use the +@option{-encoders} option to get a list of all encoders. + +@item demuxer=@var{demuxer_name} +Print detailed information about the demuxer named @var{demuxer_name}. Use the +@option{-formats} option to get a list of all demuxers and muxers. + +@item muxer=@var{muxer_name} +Print detailed information about the muxer named @var{muxer_name}. Use the +@option{-formats} option to get a list of all muxers and demuxers. + +@end table @item -version Show version. |