summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-05-15 15:34:11 +0200
committerwm4 <wm4@nowhere>2013-05-15 15:34:11 +0200
commitdb69e0edd474e81c0dac32f3a04c4b25dd4f98be (patch)
tree9c29da4d5aa120b8325393051139ba0901cedd0a
parent759b3bdc4732158d724658f523c1ea7fae93cb08 (diff)
downloadmpv-db69e0edd474e81c0dac32f3a04c4b25dd4f98be.tar.bz2
mpv-db69e0edd474e81c0dac32f3a04c4b25dd4f98be.tar.xz
options: add -V as alias for --version
This is a common convention.
-rw-r--r--DOCS/man/en/options.rst2
-rw-r--r--core/cfg-mplayer.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 2e94d367ac..8eec8408a7 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -2401,7 +2401,7 @@
*NOTE*: See ``--vd=help`` for a full list of available decoders.
---version
+--version, -V
Print version string and exit.
--vf=<filter1[=parameter1:parameter2:...],filter2,...>
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h
index 21e694d06c..8eb5234f3f 100644
--- a/core/cfg-mplayer.h
+++ b/core/cfg-mplayer.h
@@ -703,6 +703,7 @@ const m_option_t mplayer_opts[]={
{"help", (void *) help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
{"h", (void *) help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
{"version", (void *)print_version_opt, CONF_TYPE_PRINT_FUNC, CONF_NOCFG|CONF_GLOBAL|M_OPT_PRE_PARSE},
+ {"V", (void *)print_version_opt, CONF_TYPE_PRINT_FUNC, CONF_NOCFG|CONF_GLOBAL|M_OPT_PRE_PARSE},
#ifdef CONFIG_ENCODING
OPT_STRING("o", encode_output.file, CONF_GLOBAL),