added 'NoDaemon' command - added RTP/RTSP stream example

Originally committed as revision 813 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index fc92464..0a1f039 100644 (file)
--- a/doc/ffserver.conf
+++ b/doc/ffserver.conf
@@ -25,6 +25,9 @@ MaxBandwidth 1000
 
 CustomLog -
 
+# Suppress that if you want to launch ffserver as a daemon
+NoDaemon
+
 ##################################################################
 # Definition of the live feeds. Each live feed contains one video
 # and/or audio sequence coming from an ffmpeg encoder or another
@@ -304,6 +307,24 @@ StartSendOnKey
 </Stream>
 
 ##################################################################
+# RTSP examples
+
+# You can access to this stream with the RTSP URL:
+#
+# rtsp://localhost:5454/test1-rtsp.mpg
+#
+# A non standard redirector is also created. Its URL is:
+#
+# http://localhost:8090/test1-rtsp.rtsp
+#
+#<Stream test1-rtsp.mpg>
+#
+#Format rtp
+#File "/usr/local/httpd/htdocs/test1.mpg"
+#
+#</Stream>
+
+##################################################################
 # Special stream : server status
 
 <Stream stat.html>