Skip to content

F
ffmpeg-mt
Commit c3a43936 authored by diego's avatar diego
Browse files
Options

Talk of MPEG-4 instead of DivX. 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4373 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent f904e622
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
doc/ffserver.conf
View file @ c3a43936
...@@ -81,7 +81,7 @@ Feed feed1.ffm ...@@ -81,7 +81,7 @@ Feed feed1.ffm
# jpeg : Generate a single JPEG image. # jpeg : Generate a single JPEG image.
# asf : ASF compatible streaming (Windows Media Player format). # asf : ASF compatible streaming (Windows Media Player format).
# swf : Macromedia Flash compatible stream # swf : Macromedia Flash compatible stream
# avi : AVI format (OpenDivX video, MPEG audio sound) # avi : AVI format (MPEG-4 video, MPEG audio sound)
# master : special ffmpeg stream used to duplicate a server # master : special ffmpeg stream used to duplicate a server
Format mpeg Format mpeg
......
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