From 7de5459d0aa9ce99c7df07f35ec84985a60ed46f Mon Sep 17 00:00:00 2001 From: Fabrice Bellard Date: Tue, 22 Jul 2003 12:23:32 +0000 Subject: mention the two asf formats Originally committed as revision 2067 to svn://svn.ffmpeg.org/ffmpeg/trunk --- doc/ffserver.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc/ffserver.conf') diff --git a/doc/ffserver.conf b/doc/ffserver.conf index 52a71f89dd..f6e1154617 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 -- cgit v1.2.3