diff options
-rw-r--r-- | doc/ffserver.conf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/ffserver.conf b/doc/ffserver.conf index f6e1154617..794e63c2d2 100644 --- a/doc/ffserver.conf +++ b/doc/ffserver.conf @@ -79,8 +79,7 @@ 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_stream : ASF compatible streaming (Windows Media Player format). -# asf : ASF file (not streamed) +# asf : ASF compatible streaming (Windows Media Player format). # swf : Macromedia flash(tm) compatible stream # avi : AVI format (open divx video, mpeg audio sound) # master : special ffmpeg stream used to duplicate a server |