[FFmpeg-cvslog] doc: document the asf demuxer

Luca Barbato git at videolan.org
Wed Aug 28 13:08:50 CEST 2013


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Tue Aug 27 16:14:42 2013 +0200| [48f2e53ad0c8586369c3ce88712f0b9cec5a4c47] | committer: Luca Barbato

doc: document the asf demuxer

And drop a typo from the previous FLV entry.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48f2e53ad0c8586369c3ce88712f0b9cec5a4c47
---

 doc/demuxers.texi |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 36292b8..2f2f464 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
- at item -flv_demuxer @var{bool}
+ at item -flv_metadata @var{bool}
 Allocate the streams according to the onMetaData array content.
 @end table
 
+ at section asf
+
+Advanced Systems Format demuxer.
+
+This demuxer is used to demux ASF files and MMS network streams.
+
+ at table @option
+ at item -no_resync_search @var{bool}
+Do not try to resynchronize by looking for a certain optional start code.
+ at end table
+
 @c man end INPUT DEVICES



More information about the ffmpeg-cvslog mailing list