summaryrefslogtreecommitdiff
path: root/doc/ffmpeg-doc.texi
diff options
context:
space:
mode:
authorDaniel Verkamp <daniel@drv.nu>2009-11-20 10:23:40 +0000
committerDaniel Verkamp <daniel@drv.nu>2009-11-20 10:23:40 +0000
commit0584b71823b4d7df2a0c1db54156f1f7ed0a319d (patch)
treef3d5e1d0d8ec2624a9ae4c8f13bb27659c721659 /doc/ffmpeg-doc.texi
parent76267e4e90a3b64f98ca0e4517eff44e963d5e18 (diff)
Document -formats split
Originally committed as revision 20561 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffmpeg-doc.texi')
-rw-r--r--doc/ffmpeg-doc.texi23
1 files changed, 20 insertions, 3 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index b6706f4c50..98c710a8ec 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -235,9 +235,20 @@ Show help.
Show version.
@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
@item D
Decoding available
@@ -253,6 +264,12 @@ Codec supports direct rendering
Codec can handle input truncated at random locations instead of only at frame boundaries
@end table
+@item -bsfs
+Show available bitstream filters.
+
+@item -protocols
+Show available protocols.
+
@item -f @var{fmt}
Force format.
@@ -933,7 +950,7 @@ to standard output.
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
FFserver (see the FFserver documentation). When FFmpeg will be a