Commit 0584b718 authored by Daniel Verkamp's avatar Daniel Verkamp

Document -formats split

Originally committed as revision 20561 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 76267e4e
...@@ -42,6 +42,7 @@ version <next>: ...@@ -42,6 +42,7 @@ version <next>:
- MD STUDIO audio demuxer - MD STUDIO audio demuxer
- RF64 support in WAV demuxer - RF64 support in WAV demuxer
- MPEG-4 Audio Lossless Coding (ALS) decoder - MPEG-4 Audio Lossless Coding (ALS) decoder
- -formats option split into -formats, -codecs, -bsfs, and -protocols
......
...@@ -235,9 +235,20 @@ Show help. ...@@ -235,9 +235,20 @@ Show help.
Show version. Show version.
@item -formats @item -formats
Show available formats, codecs, bitstream filters, protocols, and frame size and frame rate abbreviations. Show available formats.
The fields preceding the format and codec names have the following meanings: The fields preceding the format names have the following meanings:
@table @samp
@item D
Decoding available
@item E
Encoding available
@end table
@item -codecs
Show available codecs.
The fields preceding the codec names have the following meanings:
@table @samp @table @samp
@item D @item D
Decoding available Decoding available
...@@ -253,6 +264,12 @@ Codec supports direct rendering ...@@ -253,6 +264,12 @@ Codec supports direct rendering
Codec can handle input truncated at random locations instead of only at frame boundaries Codec can handle input truncated at random locations instead of only at frame boundaries
@end table @end table
@item -bsfs
Show available bitstream filters.
@item -protocols
Show available protocols.
@item -f @var{fmt} @item -f @var{fmt}
Force format. Force format.
...@@ -933,7 +950,7 @@ to standard output. ...@@ -933,7 +950,7 @@ to standard output.
FFmpeg also handles many protocols specified with an URL syntax. FFmpeg also handles many protocols specified with an URL syntax.
Use 'ffmpeg -formats' to see a list of the supported protocols. Use 'ffmpeg -protocols' to see a list of the supported protocols.
The protocol @code{http:} is currently used only to communicate with The protocol @code{http:} is currently used only to communicate with
FFserver (see the FFserver documentation). When FFmpeg will be a FFserver (see the FFserver documentation). When FFmpeg will be a
......
...@@ -36,7 +36,13 @@ Show version. ...@@ -36,7 +36,13 @@ Show version.
@item -L @item -L
Show license. Show license.
@item -formats @item -formats
Show available formats, codecs, protocols, ... Show available formats.
@item -codecs
Show available codecs.
@item -bsfs
Show available bitstream filters.
@item -protocols
Show available protocols.
@item -x @var{width} @item -x @var{width}
Force displayed width. Force displayed width.
@item -y @var{height} @item -y @var{height}
......
...@@ -242,7 +242,13 @@ Show version. ...@@ -242,7 +242,13 @@ Show version.
@item -L @item -L
Show license. Show license.
@item -formats @item -formats
Show available formats, codecs, protocols, ... Show available formats.
@item -codecs
Show available codecs.
@item -bsfs
Show available bitstream filters.
@item -protocols
Show available protocols.
@item -h @item -h
Show help. Show help.
@item -loglevel @var{loglevel} @item -loglevel @var{loglevel}
......
...@@ -32,7 +32,7 @@ GPL components, GPL version 3) to use it. ...@@ -32,7 +32,7 @@ GPL components, GPL version 3) to use it.
@chapter Supported File Formats and Codecs @chapter Supported File Formats and Codecs
You can use the @code{-formats} option to have an exhaustive list. You can use the @code{-formats} and @code{-codecs} options to have an exhaustive list.
@section File Formats @section File Formats
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment