From bc4a1ffe96f544b0380431d7c9fc4c997d01e065 Mon Sep 17 00:00:00 2001
From: Fabrice Bellard <fabrice@bellard.org>
Date: Thu, 25 Jul 2002 17:09:20 +0000
Subject: added 'NoDaemon' command - added RTP/RTSP stream example

Originally committed as revision 813 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 doc/ffserver.conf | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'doc')

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index fc92464783..0a1f039d66 100644
--- 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
@@ -303,6 +306,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
 
-- 
cgit v1.2.3