summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-22 01:03:22 +0200
committerwm4 <wm4@nowhere>2013-07-22 01:50:22 +0200
commit5e0ee41617387118deb463663176fb4d52a0a6e3 (patch)
tree36692118cfc93049b49f7312c574e819670c4b0d /core
parent549ef68c62f2585d7818003cc2e57d82c7e46714 (diff)
downloadmpv-5e0ee41617387118deb463663176fb4d52a0a6e3.tar.bz2
mpv-5e0ee41617387118deb463663176fb4d52a0a6e3.tar.xz
options: move --colorkey option to vo_xv
Diffstat (limited to 'core')
-rw-r--r--core/options.c4
-rw-r--r--core/options.h2
2 files changed, 0 insertions, 6 deletions
diff --git a/core/options.c b/core/options.c
index 2fa6e319ab..cce36b90bb 100644
--- a/core/options.c
+++ b/core/options.c
@@ -557,8 +557,6 @@ const m_option_t mp_opts[] = {
OPT_FLAG("fs", vo.fullscreen, 0),
// set fullscreen switch method (workaround for buggy WMs)
OPT_INTRANGE("fsmode-dontuse", vo.fsmode, 0, 31, 4096),
- OPT_INT("colorkey", vo.colorkey, 0),
- OPT_FLAG_STORE("no-colorkey", vo.colorkey, 0, 0x1000000),
OPT_FLAG("native-keyrepeat", vo.native_keyrepeat, 0),
OPT_FLOATRANGE("panscan", vo.panscan, 0, 0.0, 1.0),
OPT_FLOATRANGE("panscanrange", vo.panscanrange, 0, -19.0, 99.0),
@@ -739,8 +737,6 @@ const struct MPOpts mp_default_opts = {
.panscan = 0.0f,
.keepaspect = 1,
.border = 1,
- .colorkey = 0x0000ff00, // default colorkey is green
- // (0xff000000 means that colorkey has been disabled)
.WinID = -1,
},
.wintitle = "mpv - ${media-title}",
diff --git a/core/options.h b/core/options.h
index 212c3c79c9..e7f04b548c 100644
--- a/core/options.h
+++ b/core/options.h
@@ -29,8 +29,6 @@ typedef struct mp_vo_opts {
int keepaspect;
int border;
- int colorkey;
-
int nomouse_input;
int enable_mouse_movements;
int cursor_autohide_delay;