From 7fc332c7ba6eb020c18ae1b88e309cbf88c079a4 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sat, 9 Aug 2008 12:52:23 +0000 Subject: Remove reference to the unsupported master format from ffserver.conf. Originally committed as revision 14675 to svn://svn.ffmpeg.org/ffmpeg/trunk --- doc/ffserver.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'doc') diff --git a/doc/ffserver.conf b/doc/ffserver.conf index f7db66ed26..cae1a140c9 100644 --- a/doc/ffserver.conf +++ b/doc/ffserver.conf @@ -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 -- cgit v1.2.3