diff options
| author | Michael Niedermayer | 2012-11-16 13:07:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer | 2012-11-16 13:07:10 +0100 |
| commit | 3db32ec119e5a7811e7ee1d41e3becc261fbb296 (patch) | |
| tree | c7a17b1094082626e7c85bfb8752e385bc8973c5 /doc/ffserver.conf | |
| parent | 926481078b4f930ac9bb9ca2b4ab660cc9190935 (diff) | |
| parent | bf5f46b4cc47b7a4568119f224057d4ff91b6cdd (diff) | |
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.conf')
| -rw-r--r-- | doc/ffserver.conf | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/doc/ffserver.conf b/doc/ffserver.conf index d10ac5bc09..0f5922cc3e 100644 --- a/doc/ffserver.conf +++ b/doc/ffserver.conf @@ -25,10 +25,6 @@ MaxBandwidth 1000 # '-' is the standard output. 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 |