aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-08-27 16:14:42 +0200
committerLuca Barbato <lu_zero@gentoo.org>2013-08-28 11:02:56 +0200
commit48f2e53ad0c8586369c3ce88712f0b9cec5a4c47 (patch)
tree94cc17ccef2c2fce94f4f25dbbd4672a5c41899a /doc
parent0ce1a7598e84abe6fb3684d0d5b0872d36f001d7 (diff)
downloadffmpeg-48f2e53ad0c8586369c3ce88712f0b9cec5a4c47.tar.gz
doc: document the asf demuxer
And drop a typo from the previous FLV entry.
Diffstat (limited to 'doc')
-rw-r--r--doc/demuxers.texi13
1 files changed, 12 insertions, 1 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 36292b895f..2f2f464404 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -95,8 +95,19 @@ 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
+@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