diff options
author | Philip Gladstone <philipjsg@users.sourceforge.net> | 2002-05-30 02:54:25 +0000 |
---|---|---|
committer | Philip Gladstone <philipjsg@users.sourceforge.net> | 2002-05-30 02:54:25 +0000 |
commit | 4e33b83b18770b8f2b260e2efdaf7305ffcf45a7 (patch) | |
tree | 7fb0f683e589e3a41bdbb1360e2a8d381ec4de8a | |
parent | cde25790ec587a0810209b5fff6ba3daa1810a3b (diff) | |
download | ffmpeg-4e33b83b18770b8f2b260e2efdaf7305ffcf45a7.tar.gz |
Added Launch, FaviconURL and Redirect examples
Originally committed as revision 631 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | doc/ffserver.conf | 43 |
1 files changed, 41 insertions, 2 deletions
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 </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> |