mention the two asf formats

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2067 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index 52a71f89dd86763d51e7a3df6aaf44bf5cd33ef5..f6e1154617781cbd33c7fec7016d4fe7e7fdcd00 100644 (file)
--- a/doc/ffserver.conf
+++ b/doc/ffserver.conf
@@ -79,7 +79,8 @@ Feed feed1.ffm
 # ra         : Real Networks compatible stream. Audio only.
 # mpjpeg     : Multipart JPEG (works with Netscape without any plugin)
 # jpeg       : Generate a single JPEG image.
-# asf        : ASF compatible stream (Windows Media Player format).
+# asf_stream : ASF compatible streaming (Windows Media Player format).
+# asf        : ASF file (not streamed)
 # swf        : Macromedia flash(tm) compatible stream
 # avi        : AVI format (open divx video, mpeg audio sound)
 # master     : special ffmpeg stream used to duplicate a server