Commit 4e33b83b authored by Philip Gladstone's avatar Philip Gladstone

Added Launch, FaviconURL and Redirect examples

Originally committed as revision 631 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent cde25790
......@@ -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
</Feed>
......@@ -261,13 +264,41 @@ Format asf
#
VideoFrameRate 15
VideoSize 352x240
VideoBitRate 128
VideoBitRate 256
VideoGopSize 30
AudioBitRate 64
StartSendOnKey
</Stream>
<Stream testv.asf>
Feed feed1.ffm
Format asf
#
VideoFrameRate 15
VideoSize 352x240
VideoBitRate 256
VideoGopSize 30
NoAudio
StartSendOnKey
</Stream>
<Stream testv2.asf>
Feed feed1.ffm
Format asf
#
VideoFrameRate 15
VideoSize 352x240
VideoBitRate 128
VideoGopSize 30
NoAudio
StartSendOnKey
</Stream>
##################################################################
# Special stream : server status
......@@ -275,4 +306,12 @@ StartSendOnKey
Format status
FaviconURL http://pond1.gladstonefamily.net:8080/favicon.ico
</Stream>
<Redirect index.html>
# maps index.html to the appropriate site
URL http://ffmpeg.sourceforge.net/
</Redirect>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment