Skip to content
Snippets Groups Projects
Commit 7de5459d authored by Fabrice Bellard's avatar Fabrice Bellard
Browse files

mention the two asf formats 

Originally committed as revision 2067 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 3bb07d61
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
doc/ffserver.conf
+ 2
− 1
View file @ 7de5459d
...@@ -79,7 +79,8 @@ Feed feed1.ffm ...@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment