diff --git a/doc/ffserver.conf b/doc/ffserver.conf index 4d46629e5e..3ffa140725 100644 --- a/doc/ffserver.conf +++ b/doc/ffserver.conf @@ -46,7 +46,10 @@ CustomLog - # File=/tmp/feed_name.ffm FileMaxSize=5M File /tmp/feed1.ffm -FileMaxSize 50M +FileMaxSize 200K + +# Specify launch in order to start ffmpeg automatically +# Launch @@ -261,13 +264,41 @@ Format asf # VideoFrameRate 15 VideoSize 352x240 -VideoBitRate 128 +VideoBitRate 256 VideoGopSize 30 AudioBitRate 64 StartSendOnKey + + +Feed feed1.ffm +Format asf +# +VideoFrameRate 15 +VideoSize 352x240 +VideoBitRate 256 +VideoGopSize 30 +NoAudio +StartSendOnKey + + + + + +Feed feed1.ffm +Format asf +# +VideoFrameRate 15 +VideoSize 352x240 +VideoBitRate 128 +VideoGopSize 30 +NoAudio +StartSendOnKey + + + ################################################################## # Special stream : server status @@ -275,4 +306,12 @@ StartSendOnKey Format status +FaviconURL http://pond1.gladstonefamily.net:8080/favicon.ico + + + + +# maps index.html to the appropriate site +URL http://ffmpeg.sourceforge.net/ +