summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2008-06-22 16:30:21 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2008-06-22 16:30:21 +0000
commit60b51bb262f59f1267242e7af7dd2050af7300c9 (patch)
tree4aeb1f893850ec60a01899a04b58e5b69781c352
parentdea7da106385de394ae89f2dfd5258bc7117f9ae (diff)
Document ffserver daemon mode.
Originally committed as revision 13895 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--doc/ffserver-doc.texi5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/ffserver-doc.texi b/doc/ffserver-doc.texi
index 6099fd2355..ddc8014b28 100644
--- a/doc/ffserver-doc.texi
+++ b/doc/ffserver-doc.texi
@@ -16,6 +16,11 @@ several live feeds, streaming from files and time shifting on live feeds
(you can seek to positions in the past on each live feed, provided you
specify a big enough feed storage in ffserver.conf).
+FFserver runs in daemon mode by default; that is, it puts itself in
+the background and detaches from its TTY, unless it is launched in
+debug mode or a NoDaemon option is specified in the configuration
+file.
+
This documentation covers only the streaming aspects of ffserver /
ffmpeg. All questions about parameters for ffmpeg, codec questions,
etc. are not covered here. Read @file{ffmpeg-doc.html} for more