Commit 7fc332c7 authored by Stefano Sabatini's avatar Stefano Sabatini

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

Originally committed as revision 14675 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent cc0591da
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment