diff options
| author | wm4 <wm4@mplayer2.org> | 2012-05-20 11:42:44 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-05-20 11:42:44 +0200 |
| commit | 2793e7eb70a342b346788f83e1ed660c8e0d491e (patch) | |
| tree | fe62d4ab03de24c568244b66f10990e09af3a370 /cfg-mplayer.h | |
| parent | 4488583dda2754a2e71ec991e9541bcc2c259da3 (diff) | |
| parent | f63dbaddb6de6add6d987dc28ca8771aca230451 (diff) | |
| download | mpv-2793e7eb70a342b346788f83e1ed660c8e0d491e.tar.bz2 mpv-2793e7eb70a342b346788f83e1ed660c8e0d491e.tar.xz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'cfg-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 1d18949ce0..b94b1cf7cc 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -373,7 +373,8 @@ const m_option_t common_opts[] = { // ------------------------- common options -------------------- OPT_MAKE_FLAGS("quiet", quiet, CONF_GLOBAL), {"really-quiet", &verbose, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_PRE_PARSE, 0, -10, NULL}, - {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL}, + // -v is handled in command line preparser + {"v", NULL, CONF_TYPE_FLAG, CONF_NOCFG, 0, 0, NULL}, {"msglevel", (void *) msgl_config, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, {"msgcolor", &mp_msg_color, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"nomsgcolor", &mp_msg_color, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, |