[Ffmpeg-cvslog] CVS: ffmpeg/doc ffserver.conf,1.21,1.22

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg/doc
In directory mail:/var2/tmp/cvs-serv23916/doc

Modified Files:
	ffserver.conf 
Log Message:
Talk of MPEG-4 instead of DivX.


Index: ffserver.conf
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/doc/ffserver.conf,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ffserver.conf	10 Jun 2005 10:26:44 -0000	1.21
+++ ffserver.conf	11 Jun 2005 15:56:19 -0000	1.22
@@ -81,7 +81,7 @@
 # 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