summaryrefslogtreecommitdiffstats
path: root/video/out/vo_xv.c
diff options
context:
space:
mode:
Diffstat (limited to 'video/out/vo_xv.c')
-rw-r--r--video/out/vo_xv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c
index bc0920c2eb..46079aaf5f 100644
--- a/video/out/vo_xv.c
+++ b/video/out/vo_xv.c
@@ -317,7 +317,7 @@ static void xv_print_ck_info(struct xvctx *xv)
}
}
-/* NOTE: If vo_colorkey has bits set after the first 3 low order bytes
+/* NOTE: If vo.colorkey has bits set after the first 3 low order bytes
* we don't draw anything as this means it was forced to off. */
static int xv_init_colorkey(struct vo *vo)
{
@@ -328,7 +328,7 @@ static int xv_init_colorkey(struct vo *vo)
/* check if colorkeying is needed */
xv_atom = xv_intern_atom_if_exists(vo, "XV_COLORKEY");
- if (xv_atom != None && !(vo_colorkey & 0xFF000000)) {
+ if (xv_atom != None && !(vo->opts->vo.colorkey & 0xFF000000)) {
if (ctx->xv_ck_info.source == CK_SRC_CUR) {
int colorkey_ret;
@@ -342,14 +342,14 @@ static int xv_init_colorkey(struct vo *vo)
return 0; // error getting colorkey
}
} else {
- ctx->xv_colorkey = vo_colorkey;
+ ctx->xv_colorkey = vo->opts->vo.colorkey;
/* check if we have to set the colorkey too */
if (ctx->xv_ck_info.source == CK_SRC_SET) {
xv_atom = XInternAtom(display, "XV_COLORKEY", False);
rez = XvSetPortAttribute(display, ctx->xv_port, xv_atom,
- vo_colorkey);
+ vo->opts->vo.colorkey);
if (rez != Success) {
mp_msg(MSGT_VO, MSGL_FATAL, "[xv] Couldn't set colorkey!\n");
return 0; // error setting colorkey