summaryrefslogtreecommitdiffstats
path: root/cfg-mplayer.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-10-16 08:06:55 +0300
committerUoti Urpala <uau@mplayer2.org>2011-10-16 08:06:55 +0300
commit70426031363b2e389c6a278002c3e720380ea902 (patch)
treeaf8e598fa1a99544799ea62cb62ccebde8eda5e2 /cfg-mplayer.h
parent20256a8a64c9679bc9136bbdd7f0c687ad2361c1 (diff)
downloadmpv-70426031363b2e389c6a278002c3e720380ea902.tar.bz2
mpv-70426031363b2e389c6a278002c3e720380ea902.tar.xz
options: --lavfdopts, --reuse-socket: remove "global" flag
--reuse-socket and --lavfdopts had the CONF_GLOBAL flag set. I see no reason why they could not be set per file. Remove the flag from both options.
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r--cfg-mplayer.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 274b23d1ac..b197854df5 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -445,8 +445,8 @@ const m_option_t common_opts[] = {
{"cookies-file", &cookies_file, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"prefer-ipv4", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"ipv4-only-proxy", &network_ipv4_only_proxy, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"reuse-socket", &reuse_socket, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
- {"noreuse-socket", &reuse_socket, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
+ {"reuse-socket", &reuse_socket, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"noreuse-socket", &reuse_socket, CONF_TYPE_FLAG, 0, 1, 0, NULL},
#ifdef HAVE_AF_INET6
{"prefer-ipv6", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 1, 0, NULL},
#else
@@ -629,7 +629,7 @@ const m_option_t common_opts[] = {
#ifdef CONFIG_FFMPEG
{"lavdopts", (void *) lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
- {"lavfdopts", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
+ {"lavfdopts", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#endif
#ifdef CONFIG_XVID4
{"xvidopts", (void *)xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},