summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
diff options
context:
space:
mode:
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r--cfg-mplayer.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 4bd7daba1c..d317f0eb32 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -338,7 +338,8 @@ const m_option_t common_opts[] = {
// ------------------------- stream options --------------------
#ifdef CONFIG_STREAM_CACHE
- OPT_INTRANGE("cache", stream_cache_size, 0, 32, 0x7fffffff, OPTDEF_INT(-1)),
+ OPT_INTRANGE("cache", stream_cache_size, M_OPT_LOCAL, 32, 0x7fffffff,
+ OPTDEF_INT(-1)),
OPT_FLAG_CONSTANTS("no-cache", stream_cache_size, 0, -1, 0),
OPT_FLOATRANGE("cache-min", stream_cache_min_percent, 0, 0, 99),
@@ -588,7 +589,10 @@ const m_option_t mplayer_opts[]={
OPT_STRING("mixer", mixer_device, 0),
OPT_STRING("mixer-channel", mixer_channel, 0),
- OPT_MAKE_FLAGS("softvol", softvol, 0),
+ OPT_CHOICE("softvol", softvol, 0,
+ ({"no", SOFTVOL_NO},
+ {"yes", SOFTVOL_YES},
+ {"auto", SOFTVOL_AUTO})),
OPT_FLOATRANGE("softvol-max", softvol_max, 0, 10, 10000),
{"volstep", &volstep, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
{"volume", &start_volume, CONF_TYPE_FLOAT, CONF_RANGE, -1, 10000, NULL},
@@ -764,6 +768,8 @@ const m_option_t mplayer_opts[]={
OPT_MAKE_FLAGS("orawts", encode_output.rawts, CONF_GLOBAL),
OPT_MAKE_FLAGS("oautofps", encode_output.autofps, CONF_GLOBAL),
OPT_MAKE_FLAGS("oneverdrop", encode_output.neverdrop, CONF_GLOBAL),
+ OPT_MAKE_FLAGS("ovfirst", encode_output.video_first, CONF_GLOBAL),
+ OPT_MAKE_FLAGS("oafirst", encode_output.audio_first, CONF_GLOBAL),
{NULL, NULL, 0, 0, 0, 0, NULL}
};