summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/ffserver.conf2
1 files changed, 1 insertions, 1 deletions
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