diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-07-22 12:23:32 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-07-22 12:23:32 +0000 |
| commit | 7de5459d0aa9ce99c7df07f35ec84985a60ed46f (patch) | |
| tree | e47bf2046bf0c6e70a15198592477306c7626208 /doc/ffserver.conf | |
| parent | 3bb07d616556f6489ce3aab1a5ec6b6dfbbd6217 (diff) | |
| download | ffmpeg-7de5459d0aa9ce99c7df07f35ec84985a60ed46f.tar.gz | |
mention the two asf formats
Originally committed as revision 2067 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffserver.conf')
| -rw-r--r-- | doc/ffserver.conf | 3 |
1 files changed, 2 insertions, 1 deletions
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 |