[FFmpeg-cvslog] r14675 - trunk/doc/ffserver.conf

[stefano]

Author: stefano
Date: Sat Aug  9 14:52:23 2008
New Revision: 14675

Log:
Remove reference to the unsupported master format from ffserver.conf.


Modified:
   trunk/doc/ffserver.conf

Modified: trunk/doc/ffserver.conf
==============================================================================
--- trunk/doc/ffserver.conf	(original)
+++ trunk/doc/ffserver.conf	Sat Aug  9 14:52:23 2008
@@ -84,7 +84,6 @@ Feed feed1.ffm
 # asf        : ASF compatible streaming (Windows Media Player format).
 # swf        : Macromedia Flash compatible stream
 # avi        : AVI format (MPEG-4 video, MPEG audio sound)
-# master     : special ffmpeg stream used to duplicate a server
 Format mpeg
 
 # Bitrate for the audio stream. Codecs usually support only a few