diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffserver.conf | 1 |
1 files changed, 0 insertions, 1 deletions
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 |