Commit de51598b authored by bellard's avatar bellard

mention the two asf formats


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2067 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 6558ba45
......@@ -79,7 +79,8 @@ 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 : 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
# avi : AVI format (open divx video, mpeg audio sound)
# master : special ffmpeg stream used to duplicate a server
......
Markdown is supported
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