Commit 5d4c2855 authored by stefano's avatar stefano

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14675 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 2c7a6293
......@@ -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