Home Explore Help
Sign In
SMusatov
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Files Wiki
Browse Source

mention the two asf formats

Originally committed as revision 2067 to svn://svn.ffmpeg.org/ffmpeg/trunk
Fabrice Bellard 21 years ago
parent
3bb07d6165
commit
7de5459d0a
1 changed files with 2 additions and 1 deletions
Unified View Show Diff Stats
  1. 2 1
      doc/ffserver.conf

+ 2 - 1
doc/ffserver.conf
View File 

@@ -79,7 +79,8 @@ Feed feed1.ffm
 
 # ra         : Real Networks compatible stream. Audio only.
 
 # ra         : Real Networks compatible stream. Audio only.
 
 # mpjpeg     : Multipart JPEG (works with Netscape without any plugin)
 
 # mpjpeg     : Multipart JPEG (works with Netscape without any plugin)
 
 # jpeg       : Generate a single JPEG image.
 
 # 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
 
 # swf        : Macromedia flash(tm) compatible stream
 
 # avi        : AVI format (open divx video, mpeg audio sound)
 
 # avi        : AVI format (open divx video, mpeg audio sound)
 
 # master     : special ffmpeg stream used to duplicate a server
 
 # master     : special ffmpeg stream used to duplicate a server