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

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index 15637ef..52a71f8 100644 (file)
--- 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