AFC demuxer

[ffmpeg] / doc / ffserver.conf

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index d10ac5bc09f29bfedeee38122b3135ad633e0a9b..0f5922cc3e125af1d7e2ea447f8464fbc7b373e1 100644 (file)
--- 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