[FFmpeg-cvslog] r20035 - in trunk: doc/ffserver-doc.texi ffserver.c

[stefano]

Author: stefano
Date: Sun Sep 27 01:30:41 2009
New Revision: 20035

Log:
Add support to the -loglevel option.

Modified:
   trunk/doc/ffserver-doc.texi
   trunk/ffserver.c

Modified: trunk/doc/ffserver-doc.texi
==============================================================================
--- trunk/doc/ffserver-doc.texi	Sun Sep 27 00:54:29 2009	(r20034)
+++ trunk/doc/ffserver-doc.texi	Sun Sep 27 01:30:41 2009	(r20035)
@@ -245,6 +245,20 @@ Show license.
 Show available formats, codecs, protocols, ...
 @item -h
 Show help.
+ at item -loglevel @var{loglevel}
+Set the logging level used by the library.
+ at var{loglevel} is a number or a string containing one of the following values:
+ at table @samp
+ at item quiet
+ at item panic
+ at item fatal
+ at item error
+ at item warning
+ at item info
+ at item verbose
+ at item debug
+ at end table
+
 @item -f @var{configfile}
 Use @file{configfile} instead of @file{/etc/ffserver.conf}.
 @item -n

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	Sun Sep 27 00:54:29 2009	(r20034)
+++ trunk/ffserver.c	Sun Sep 27 01:30:41 2009	(r20035)
@@ -4528,6 +4528,7 @@ static const OptionDef options[] = {
     { "version", OPT_EXIT, {(void*)show_version}, "show version" },
     { "L", OPT_EXIT, {(void*)show_license}, "show license" },
     { "formats", OPT_EXIT, {(void*)show_formats}, "show available formats, codecs, protocols, ..." },
+    { "loglevel", HAS_ARG | OPT_FUNC2, {(void*)opt_loglevel}, "set libav* logging level", "logging level number or string" },
     { "n", OPT_BOOL, {(void *)&no_launch }, "enable no-launch mode" },
     { "d", 0, {(void*)opt_debug}, "enable debug mode" },
     { "f", HAS_ARG | OPT_STRING, {(void*)&config_filename }, "use configfile instead of /etc/ffserver.conf", "configfile" },