diff options
| author | Alexander Preisinger <alexander.preisinger@gmail.com> | 2013-03-04 22:41:27 +0100 |
|---|---|---|
| committer | Alexander Preisinger <alexander.preisinger@gmail.com> | 2013-03-04 23:32:47 +0100 |
| commit | 1198c031e4233a0cff5aa7d24aab986163f6903a (patch) | |
| tree | bff49197908452f3ad1363edcf4c527db9bf1fe0 /video/out/vo_xv.c | |
| parent | 4949992264d78d6dd22c0f6c611850402fd6eb30 (diff) | |
| download | mpv-1198c031e4233a0cff5aa7d24aab986163f6903a.tar.bz2 mpv-1198c031e4233a0cff5aa7d24aab986163f6903a.tar.xz | |
vo: Separate vo options from MPOpts
Separate the video output options from the big MPOpts structure and also only
pass the new mp_vo_opts structure to the vo backend.
Move video_driver_list into mp_vo_opts
Diffstat (limited to 'video/out/vo_xv.c')
| -rw-r--r-- | video/out/vo_xv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c index 46079aaf5f..8435b7da85 100644 --- a/video/out/vo_xv.c +++ b/video/out/vo_xv.c @@ -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->opts->vo.colorkey & 0xFF000000)) { + if (xv_atom != None && !(vo->opts->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->opts->vo.colorkey; + ctx->xv_colorkey = vo->opts->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->opts->vo.colorkey); + vo->opts->colorkey); if (rez != Success) { mp_msg(MSGT_VO, MSGL_FATAL, "[xv] Couldn't set colorkey!\n"); return 0; // error setting colorkey |