diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-16 13:07:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-16 13:07:10 +0100 |
| commit | 3db32ec119e5a7811e7ee1d41e3becc261fbb296 (patch) | |
| tree | c7a17b1094082626e7c85bfb8752e385bc8973c5 /doc/ffserver.texi | |
| parent | 926481078b4f930ac9bb9ca2b4ab660cc9190935 (diff) | |
| parent | bf5f46b4cc47b7a4568119f224057d4ff91b6cdd (diff) | |
| download | ffmpeg-3db32ec119e5a7811e7ee1d41e3becc261fbb296.tar.gz | |
Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'
* commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd':
APIChanges: add entry for av_read_packet deprecation
mxfdec: fix typo in mxf_read_seek()
avserver: use freopen to redirect stdin/out/err to /dev/null
avserver: remove daemon mode
configure: Check for -Werror parameters on clang
doxygen: remove obsolete options from Doxyfile
configure: Add option to disable all command line programs
Conflicts:
Changelog
configure
doc/APIchanges
doc/ffserver.conf
doc/ffserver.texi
ffserver.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 |