Browse code

Document -formats split

Originally committed as revision 20561 to svn://svn.ffmpeg.org/ffmpeg/trunk

Daniel Verkamp authored on 2009/11/20 19:23:40
Showing 5 changed files
... ...
@@ -42,6 +42,7 @@ version <next>:
42 42
 - MD STUDIO audio demuxer
43 43
 - RF64 support in WAV demuxer
44 44
 - MPEG-4 Audio Lossless Coding (ALS) decoder
45
+- -formats option split into -formats, -codecs, -bsfs, and -protocols
45 46
 
46 47
 
47 48
 
... ...
@@ -235,9 +235,20 @@ Show help.
235 235
 Show version.
236 236
 
237 237
 @item -formats
238
-Show available formats, codecs, bitstream filters, protocols, and frame size and frame rate abbreviations.
238
+Show available formats.
239 239
 
240
-The fields preceding the format and codec names have the following meanings:
240
+The fields preceding the format names have the following meanings:
241
+@table @samp
242
+@item D
243
+Decoding available
244
+@item E
245
+Encoding available
246
+@end table
247
+
248
+@item -codecs
249
+Show available codecs.
250
+
251
+The fields preceding the codec names have the following meanings:
241 252
 @table @samp
242 253
 @item D
243 254
 Decoding available
... ...
@@ -253,6 +264,12 @@ Codec supports direct rendering
253 253
 Codec can handle input truncated at random locations instead of only at frame boundaries
254 254
 @end table
255 255
 
256
+@item -bsfs
257
+Show available bitstream filters.
258
+
259
+@item -protocols
260
+Show available protocols.
261
+
256 262
 @item -f @var{fmt}
257 263
 Force format.
258 264
 
... ...
@@ -933,7 +950,7 @@ to standard output.
933 933
 
934 934
 FFmpeg also handles many protocols specified with an URL syntax.
935 935
 
936
-Use 'ffmpeg -formats' to see a list of the supported protocols.
936
+Use 'ffmpeg -protocols' to see a list of the supported protocols.
937 937
 
938 938
 The protocol @code{http:} is currently used only to communicate with
939 939
 FFserver (see the FFserver documentation). When FFmpeg will be a
... ...
@@ -36,7 +36,13 @@ Show version.
36 36
 @item -L
37 37
 Show license.
38 38
 @item -formats
39
-Show available formats, codecs, protocols, ...
39
+Show available formats.
40
+@item -codecs
41
+Show available codecs.
42
+@item -bsfs
43
+Show available bitstream filters.
44
+@item -protocols
45
+Show available protocols.
40 46
 @item -x @var{width}
41 47
 Force displayed width.
42 48
 @item -y @var{height}
... ...
@@ -242,7 +242,13 @@ Show version.
242 242
 @item -L
243 243
 Show license.
244 244
 @item -formats
245
-Show available formats, codecs, protocols, ...
245
+Show available formats.
246
+@item -codecs
247
+Show available codecs.
248
+@item -bsfs
249
+Show available bitstream filters.
250
+@item -protocols
251
+Show available protocols.
246 252
 @item -h
247 253
 Show help.
248 254
 @item -loglevel @var{loglevel}
... ...
@@ -32,7 +32,7 @@ GPL components, GPL version 3) to use it.
32 32
 
33 33
 @chapter Supported File Formats and Codecs
34 34
 
35
-You can use the @code{-formats} option to have an exhaustive list.
35
+You can use the @code{-formats} and @code{-codecs} options to have an exhaustive list.
36 36
 
37 37
 @section File Formats
38 38