summaryrefslogtreecommitdiff
path: root/doc/ffserver.conf
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2002-07-25 17:09:20 +0000
committerFabrice Bellard <fabrice@bellard.org>2002-07-25 17:09:20 +0000
commitbc4a1ffe96f544b0380431d7c9fc4c997d01e065 (patch)
treebcc5fcfc0dabddf36e3b744264f9eecc21150362 /doc/ffserver.conf
parent2effd27446662222cdb0acf2e2074247da3df177 (diff)
downloadffmpeg-bc4a1ffe96f544b0380431d7c9fc4c997d01e065.tar.gz
added 'NoDaemon' command - added RTP/RTSP stream example
Originally committed as revision 813 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffserver.conf')
-rw-r--r--doc/ffserver.conf21
1 files changed, 21 insertions, 0 deletions
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
@@ -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>