summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-12-12 23:02:03 +0100
committerwm4 <wm4@nowhere>2012-12-12 23:02:03 +0100
commit306136a287b767d33f20678b34a60d6fef60fe9f (patch)
tree077b944fba3bb05c2ccdf9ee25da9c0f77146720 /core
parent962a97a2dbf6997a7d1f92e63a7d5c1e25870464 (diff)
downloadmpv-306136a287b767d33f20678b34a60d6fef60fe9f.tar.bz2
mpv-306136a287b767d33f20678b34a60d6fef60fe9f.tar.xz
options: handle -v during pre-parsing command line
Otherwise -v is honored too late, and some output will be missing. In particular, this prevented printing of the libav* library versions.
Diffstat (limited to 'core')
-rw-r--r--core/parser-mpcmd.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/core/parser-mpcmd.c b/core/parser-mpcmd.c
index 8007344a26..bc7499fd83 100644
--- a/core/parser-mpcmd.c
+++ b/core/parser-mpcmd.c
@@ -255,11 +255,6 @@ bool m_config_parse_mp_command_line(m_config_t *config, struct playlist *files,
continue;
}
- if (bstrcmp0(p.arg, "v") == 0) {
- verbose++;
- continue;
- }
-
if (mode == LOCAL) {
MP_TARRAY_APPEND(NULL, local_params, local_params_count,
(struct playlist_param) {p.arg, p.param});
@@ -351,6 +346,8 @@ void m_config_preparse_command_line(m_config_t *config, int argc, char **argv)
// Option parsing errors will be handled later as well.
if (p.mp_opt->flags & M_OPT_PRE_PARSE)
m_config_set_option(config, p.arg, p.param);
+ if (bstrcmp0(p.arg, "v") == 0)
+ verbose++;
}
}