Talk of MPEG-4 instead of DivX.

Originally committed as revision 4373 to svn://svn.ffmpeg.org/ffmpeg/trunk

Talk of MPEG-4 instead of DivX.
Originally committed as revision 4373 to svn://svn.ffmpeg.org/ffmpeg/trunk
f5f30f1b · Diego Biurrun · a2632fd2 · f5f30f1b
Commit f5f30f1b authored Jun 11, 2005 by Diego Biurrun
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ffserver.conf doc/ffserver.conf +1 -1

No files found.
--- a/doc/ffserver.conf
+++ b/doc/ffserver.conf
@@ -81,7 +81,7 @@ Feed feed1.ffm
 # jpeg       : Generate a single JPEG image.
 # asf        : ASF compatible streaming (Windows Media Player format).
 # 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
 Format mpeg