rmdec: add missing brackets to compound statement

[ffmpeg] / doc / demuxers.texi

diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index fc03459417c3cf3db02d547044768641e12b21fc..2f2f464404aaeb5e7989b8b18d643cc16ae6c87f 100644 (file)
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -13,7 +13,7 @@ You can disable all the demuxers using the configure option
 the option "--enable-demuxer=@var{DEMUXER}", or disable it
 with the option "--disable-demuxer=@var{DEMUXER}".
 
-The option "-formats" of the ff* tools will display the list of
+The option "-formats" of the av* tools will display the list of
 enabled demuxers.
 
 The description of some of the currently available demuxers follows.
@@ -49,21 +49,34 @@ sequence of filenames of the form @file{i%m%g-1.jpg},
 The size, the pixel format, and the format of each image must be the
 same for all the files in the sequence.
 
-The following example shows how to use @file{ffmpeg} for creating a
+The following example shows how to use @command{avconv} for creating a
 video from the images in the file sequence @file{img-001.jpeg},
 @file{img-002.jpeg}, ..., assuming an input framerate of 10 frames per
 second:
 @example
-ffmpeg -r 10 -f image2 -i 'img-%03d.jpeg' out.avi
+avconv -i 'img-%03d.jpeg' -r 10 out.mkv
 @end example
 
 Note that the pattern must not necessarily contain "%d" or
 "%0@var{N}d", for example to convert a single image file
 @file{img.jpeg} you can employ the command:
 @example
-ffmpeg -f image2 -i img.jpeg img.png
+avconv -i img.jpeg img.png
 @end example
 
+@table @option
+@item -pixel_format @var{format}
+Set the pixel format (for raw image)
+@item -video_size   @var{size}
+Set the frame size (for raw image)
+@item -framerate    @var{rate}
+Set the frame rate
+@item -loop         @var{bool}
+Loop over the images
+@item -start_number @var{start}
+Specify the first number in the sequence
+@end table
+
 @section applehttp
 
 Apple HTTP Live Streaming demuxer.
@@ -75,4 +88,26 @@ the caller can decide which variant streams to actually receive.
 The total bitrate of the variant that the stream belongs to is
 available in a metadata key named "variant_bitrate".
 
+@section flv
+
+Adobe Flash Video Format demuxer.
+
+This demuxer is used to demux FLV files and RTMP network streams.
+
+@table @option
+@item -flv_metadata @var{bool}
+Allocate the streams according to the onMetaData array content.
+@end table
+
+@section asf
+
+Advanced Systems Format demuxer.
+
+This demuxer is used to demux ASF files and MMS network streams.
+
+@table @option
+@item -no_resync_search @var{bool}
+Do not try to resynchronize by looking for a certain optional start code.
+@end table
+
 @c man end INPUT DEVICES