diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
commit | e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (patch) | |
tree | 6553efdc461e8d81ae2c9a7508b2dec5f116905a /cfg-mplayer.h | |
parent | e51225dc3135e69d3f0fe6a5502c0c0e77952056 (diff) | |
parent | 14eb21fce00bfcab5145140f22bfd706d991c101 (diff) | |
download | mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.bz2 mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.xz |
Merge svn changes up to r27899
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r-- | cfg-mplayer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 25ea24ff1b..283f9a589c 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -98,6 +98,7 @@ const m_option_t mplayer_opts[]={ {"nosoftvol", &soft_vol, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"softvol-max", &soft_vol_max, CONF_TYPE_FLOAT, CONF_RANGE, 10, 10000, NULL}, {"volstep", &volstep, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL}, + {"volume", &start_volume, CONF_TYPE_FLOAT, CONF_RANGE, -1, 10000, NULL}, {"master", "Option -master has been removed, use -af volume instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, // override audio buffer size (used only by -ao oss, anyway obsolete...) {"abs", &ao_data.buffersize, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, |