[SCM] libav/experimental: Add -?, -help, and --help as alternative options to get help.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 870e015048bccbef22bcbd86351d4bc8edb41924
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Mon Dec 21 02:20:13 2009 +0000

    Add -?, -help, and --help as alternative options to get help.
    
    Originally committed as revision 20906 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/cmdutils_common_opts.h b/cmdutils_common_opts.h
index 1c89bba..0a456bc 100644
--- a/cmdutils_common_opts.h
+++ b/cmdutils_common_opts.h
@@ -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" },
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index a0ab60d..f5c0e64 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -228,7 +228,7 @@ specified for the inputs.
 @item -L
 Show license.
 
- at item -h
+ at item -h, -?, -help, --help
 Show help.
 
 @item -version
diff --git a/doc/ffplay-doc.texi b/doc/ffplay-doc.texi
index f7b8f87..a544d61 100644
--- a/doc/ffplay-doc.texi
+++ b/doc/ffplay-doc.texi
@@ -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.
diff --git a/doc/ffserver-doc.texi b/doc/ffserver-doc.texi
index aabf330..8f0903f 100644
--- a/doc/ffserver-doc.texi
+++ b/doc/ffserver-doc.texi
@@ -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.

-- 
Libav/FFmpeg packaging