opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-24 00:27:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

incorrect comment

Browse Source 
Originally committed as revision 2068 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard
2003-07-22 12:30:38 +00:00
parent 7de5459d0a
commit 6a6362f088
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/ffserver.conf
View File

@ -79,8 +79,7 @@ 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_stream : ASF compatible streaming (Windows Media Player format). # asf : 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