diff options
Diffstat (limited to 'doc/ffserver.texi')
| -rw-r--r-- | doc/ffserver.texi | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi index c94f441cf8..dbfffd297c 100644 --- a/doc/ffserver.texi +++ b/doc/ffserver.texi @@ -28,11 +28,6 @@ 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.html} for more @@ -267,8 +262,7 @@ within the various <Stream> sections. Since ffserver will not launch any ffmpeg instances, you will have to launch them manually. @item -d Enable debug mode. This option increases log verbosity, directs log -messages to stdout and causes ffserver to run in the foreground -rather than as a daemon. +messages to stdout. @end table @c man end |