From f5f30f1bce57d1155c6e7d0a3d753900377dcd25 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Sat, 11 Jun 2005 15:56:19 +0000
Subject: [PATCH] Talk of MPEG-4 instead of DivX.

Originally committed as revision 4373 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 doc/ffserver.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index c6720908f8..62f169f9d1 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