[SCM] libav/experimental: Talk of MPEG-4 instead of DivX.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f5f30f1bce57d1155c6e7d0a3d753900377dcd25
Author: Diego Biurrun <diego at biurrun.de>
Date:   Sat Jun 11 15:56:19 2005 +0000

    Talk of MPEG-4 instead of DivX.
    
    Originally committed as revision 4373 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index c6720908..62f169f 100644
--- 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
 

-- 
Libav/FFmpeg packaging