summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/man/en/options.rst3
-rw-r--r--core/cfg-mplayer.h4
-rw-r--r--core/mplayer.c7
3 files changed, 14 insertions, 0 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index 524018db3d..2e94d367ac 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -2401,6 +2401,9 @@
*NOTE*: See ``--vd=help`` for a full list of available decoders.
+--version
+ Print version string and exit.
+
--vf=<filter1[=parameter1:parameter2:...],filter2,...>
Specify a list of video filters to apply to the video stream. See
`video_filters` for details and descriptions of the available filters.
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h
index 18a1c30324..21e694d06c 100644
--- a/core/cfg-mplayer.h
+++ b/core/cfg-mplayer.h
@@ -55,6 +55,9 @@ extern const m_option_t cdda_opts[];
extern int sws_flags;
extern const char pp_help[];
+static int print_version_opt(const m_option_t *opt, const char *name,
+ const char *param);
+
#ifdef CONFIG_RADIO
const m_option_t radioopts_conf[]={
{"device", &stream_radio_defaults.device, CONF_TYPE_STRING, 0, 0 ,0, NULL},
@@ -699,6 +702,7 @@ const m_option_t mplayer_opts[]={
{"identify", &mp_msg_levels[MSGT_IDENTIFY], CONF_TYPE_FLAG, CONF_GLOBAL, 0, MSGL_V, NULL},
{"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},
#ifdef CONFIG_ENCODING
OPT_STRING("o", encode_output.file, CONF_GLOBAL),
diff --git a/core/mplayer.c b/core/mplayer.c
index abd306426d..b0eaeffe6d 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -4566,6 +4566,13 @@ static void print_version(int always)
"%s (C) 2000-2013 mpv/MPlayer/mplayer2 projects\n built on %s\n", mplayer_version, mplayer_builddate);
}
+static int print_version_opt(const m_option_t *opt, const char *name,
+ const char *param)
+{
+ print_version(true);
+ exit(0);
+}
+
static bool handle_help_options(struct MPContext *mpctx)
{
struct MPOpts *opts = &mpctx->opts;