diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2008-08-09 12:52:23 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2008-08-09 12:52:23 +0000 |
| commit | 7fc332c7ba6eb020c18ae1b88e309cbf88c079a4 (patch) | |
| tree | 50c223503c7e283d25c8b0cc1e4dc455f4f5a748 /doc | |
| parent | cc0591dab0a5508518413260c77750577c30b0d6 (diff) | |
| download | ffmpeg-7fc332c7ba6eb020c18ae1b88e309cbf88c079a4.tar.gz | |
Remove reference to the unsupported master format from ffserver.conf.
Originally committed as revision 14675 to svn://svn.ffmpeg.org/ffmpeg/trunk
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 |