generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mention the two asf formats

Browse Source 
Originally committed as revision 2067 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2003-07-22 12:23:32 +00:00
parent 3bb07d6165
commit 7de5459d0a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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