summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/demuxers.texi13
1 files changed, 12 insertions, 1 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 140f0b1fe6..44db21f697 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -29,6 +29,17 @@ 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 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
+
@anchor{concat}
@section concat
@@ -110,7 +121,7 @@ Adobe Flash Video Format demuxer.
This demuxer is used to demux FLV files and RTMP network streams.
@table @option
-@item -flv_demuxer @var{bool}
+@item -flv_metadata @var{bool}
Allocate the streams according to the onMetaData array content.
@end table