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

[benoit]

Author: benoit
Date: Fri May 23 09:14:28 2008
New Revision: 13245

Log:
Add -formats option to ffserver.


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

Modified: trunk/doc/ffserver-doc.texi
==============================================================================
--- trunk/doc/ffserver-doc.texi	(original)
+++ trunk/doc/ffserver-doc.texi	Fri May 23 09:14:28 2008
@@ -200,6 +200,8 @@ ffserver [options]
 Show version.
 @item -L
 Print the license.
+ at item -formats
+Show available formats, codecs, protocols, ...
 @item -h
 Print the help.
 @item -f @var{configfile}

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	(original)
+++ trunk/ffserver.c	Fri May 23 09:14:28 2008
@@ -4351,6 +4351,7 @@ static const OptionDef options[] = {
     { "h", OPT_EXIT, {(void*)opt_show_help}, "show help" },
     { "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, ..." },
     { "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" },