diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-07-22 12:30:38 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-07-22 12:30:38 +0000 |
| commit | 6a6362f0885a2edfdfbe35aab178cf61cb1cfe7b (patch) | |
| tree | ee51882bfb03c2fdb7cf7827190078ded15d02ec /doc/ffserver.conf | |
| parent | 7de5459d0aa9ce99c7df07f35ec84985a60ed46f (diff) | |
| download | ffmpeg-6a6362f0885a2edfdfbe35aab178cf61cb1cfe7b.tar.gz | |
incorrect comment
Originally committed as revision 2068 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffserver.conf')
| -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 |