aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffserver.texi
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-11-28 18:54:41 +0100
committerStefano Sabatini <stefasab@gmail.com>2013-11-28 18:59:21 +0100
commit1ee9341a70ad059c7af7d34baebb332276f69421 (patch)
treeba6c4a6d30848f59ebaee722758f48b5854e4c7d /doc/ffserver.texi
parent2121945770dd87faa41fb2397a812469082ea3a8 (diff)
downloadffmpeg-1ee9341a70ad059c7af7d34baebb332276f69421.tar.gz
doc/ffserver: extend documentation for CustomLog option
Diffstat (limited to 'doc/ffserver.texi')
-rw-r--r--doc/ffserver.texi11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index abf52fce2e..31039ad6a8 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -204,8 +204,9 @@ directives within the various @code{<Stream>} sections. Since
will have to launch them manually.
@item -d
-Enable debug mode. This option increases log verbosity, directs log
-messages to stdout.
+Enable debug mode. This option increases log verbosity, and directs
+log messages to stdout. When specified, the @option{CustomLog} option
+is ignored.
@end table
@chapter Configuration file syntax
@@ -264,7 +265,11 @@ Default value is 1000.
@item CustomLog @var{filename}
Set access log file (uses standard Apache log file format).
-'-' is the standard output.
+'-' is the standard output. If not specified it will log by default on
+standard out.
+
+In case the commandline option @option{-d} is specified this option is
+ignored.
@item NoDaemon
Set no-daemon mode. This option is currently ignored since now