Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mention the two asf formats

Browse Source 
Originally committed as revision 2067 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Fabrice Bellard 22 years ago
parent 3bb07d6165
commit 7de5459d0a
1 changed files with 2 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      doc/ffserver.conf

3
doc/ffserver.conf
Unescape 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

Write Preview
Loading…
Cancel
Save