aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPhilip Gladstone <philipjsg@users.sourceforge.net>2003-06-10 01:26:29 +0000
committerPhilip Gladstone <philipjsg@users.sourceforge.net>2003-06-10 01:26:29 +0000
commit41fc0dd5a3f10a94d035820b7c2dc46cab915f80 (patch)
treecdfa85cdc64c19a1200df14636a4fb426dee19d1 /doc
parentc2f1b2cb716f844416b51030a002f93c985cc6d2 (diff)
downloadffmpeg-41fc0dd5a3f10a94d035820b7c2dc46cab915f80.tar.gz
Have the test.asf stream enabled by default (thanks to htz@kde.org)
Originally committed as revision 1943 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/ffserver.conf20
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index 15637efd75..52a71f89dd 100644
--- a/doc/ffserver.conf
+++ b/doc/ffserver.conf
@@ -195,16 +195,16 @@ VideoGopSize 12
# ASF compatible
-#<Stream test.asf>
-#Feed feed1.ffm
-#Format asf
-#VideoFrameRate 15
-#VideoSize 352x240
-#VideoBitRate 256
-#VideoGopSize 30
-#AudioBitRate 64
-#StartSendOnKey
-#</Stream>
+<Stream test.asf>
+Feed feed1.ffm
+Format asf
+VideoFrameRate 15
+VideoSize 352x240
+VideoBitRate 256
+VideoGopSize 30
+AudioBitRate 64
+StartSendOnKey
+</Stream>
# MP3 audio