[FFmpeg-cvslog] doc/ffserver: extend documentation for CustomLog option

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Nov 28 18:54:41 2013 +0100| [1ee9341a70ad059c7af7d34baebb332276f69421] | committer: Stefano Sabatini

doc/ffserver: extend documentation for CustomLog option

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ee9341a70ad059c7af7d34baebb332276f69421
---

 doc/ffserver.texi |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index abf52fc..31039ad 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