RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 16:22:37 +00:00
Code Issues Projects Releases Wiki Activity

Talk of MPEG-4 instead of DivX.

Browse Source 
Originally committed as revision 4373 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2005-06-11 15:56:19 +00:00
parent a2632fd268
commit f5f30f1bce
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/ffserver.conf
View File

@ -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