[SCM] libav/experimental: mention the two asf formats

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7de5459d0aa9ce99c7df07f35ec84985a60ed46f
Author: Fabrice Bellard <fabrice at bellard.org>
Date:   Tue Jul 22 12:23:32 2003 +0000

    mention the two asf formats
    
    Originally committed as revision 2067 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index 52a71f8..f6e1154 100644
--- 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

-- 
Libav/FFmpeg packaging