[FFmpeg-cvslog] r20906 - in trunk: cmdutils_common_opts.h doc/ffmpeg-doc.texi doc/ffplay-doc.texi doc/ffserver-doc.texi

[ramiro]

Author: ramiro
Date: Mon Dec 21 03:20:13 2009
New Revision: 20906

Log:
Add -?, -help, and --help as alternative options to get help.

Modified:
   trunk/cmdutils_common_opts.h
   trunk/doc/ffmpeg-doc.texi
   trunk/doc/ffplay-doc.texi
   trunk/doc/ffserver-doc.texi

Modified: trunk/cmdutils_common_opts.h
==============================================================================
--- trunk/cmdutils_common_opts.h	Mon Dec 21 03:15:46 2009	(r20905)
+++ trunk/cmdutils_common_opts.h	Mon Dec 21 03:20:13 2009	(r20906)
@@ -1,5 +1,8 @@
     { "L", OPT_EXIT, {(void*)show_license}, "show license" },
     { "h", OPT_EXIT, {(void*)show_help}, "show help" },
+    { "?", OPT_EXIT, {(void*)show_help}, "show help" },
+    { "help", OPT_EXIT, {(void*)show_help}, "show help" },
+    { "-help", OPT_EXIT, {(void*)show_help}, "show help" },
     { "version", OPT_EXIT, {(void*)show_version}, "show version" },
     { "formats"  , OPT_EXIT, {(void*)show_formats  }, "show available formats" },
     { "codecs"   , OPT_EXIT, {(void*)show_codecs   }, "show available codecs" },

Modified: trunk/doc/ffmpeg-doc.texi
==============================================================================
--- trunk/doc/ffmpeg-doc.texi	Mon Dec 21 03:15:46 2009	(r20905)
+++ trunk/doc/ffmpeg-doc.texi	Mon Dec 21 03:20:13 2009	(r20906)
@@ -228,7 +228,7 @@ specified for the inputs.
 @item -L
 Show license.
 
- at item -h
+ at item -h, -?, -help, --help
 Show help.
 
 @item -version

Modified: trunk/doc/ffplay-doc.texi
==============================================================================
--- trunk/doc/ffplay-doc.texi	Mon Dec 21 03:15:46 2009	(r20905)
+++ trunk/doc/ffplay-doc.texi	Mon Dec 21 03:20:13 2009	(r20906)
@@ -29,7 +29,7 @@ ffplay [options] @file{input_file}
 @section Main options
 
 @table @option
- at item -h
+ at item -h, -?, -help, --help
 Show help.
 @item -version
 Show version.

Modified: trunk/doc/ffserver-doc.texi
==============================================================================
--- trunk/doc/ffserver-doc.texi	Mon Dec 21 03:15:46 2009	(r20905)
+++ trunk/doc/ffserver-doc.texi	Mon Dec 21 03:20:13 2009	(r20906)
@@ -251,7 +251,7 @@ Show available bitstream filters.
 Show available protocols.
 @item -filters
 Show available libavfilter filters.
- at item -h
+ at item -h, -?, -help, --help
 Show help.
 @item -loglevel @var{loglevel}
 Set the logging level used by the library.