diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-07-06 13:07:37 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-07-06 13:07:37 +0300 |
| commit | 2670ceeb81e009f88812f4014e08b88317a2cf42 (patch) | |
| tree | b6f2a6367fcc8998a531d209745770789ae03fcd /libvo/vo_xv.c | |
| parent | b7f574405350f93083fb423c34a21788684e10d4 (diff) | |
| parent | a7b99687a7c8b59abb67f725c1cbc648ab439c74 (diff) | |
| download | mpv-2670ceeb81e009f88812f4014e08b88317a2cf42.tar.bz2 mpv-2670ceeb81e009f88812f4014e08b88317a2cf42.tar.xz | |
Merge branch 'mplayer1_changes'
Diffstat (limited to 'libvo/vo_xv.c')
| -rw-r--r-- | libvo/vo_xv.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 5b908684bb..64324c9785 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -252,11 +252,12 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, depth = 24; XMatchVisualInfo(x11->display, x11->screen, depth, TrueColor, &vinfo); - xswa.background_pixel = 0; - if (x11->xv_ck_info.method == CK_METHOD_BACKGROUND) - xswa.background_pixel = x11->xv_colorkey; xswa.border_pixel = 0; - xswamask = CWBackPixel | CWBorderPixel; + xswamask = CWBorderPixel; + if (x11->xv_ck_info.method == CK_METHOD_BACKGROUND) { + xswa.background_pixel = x11->xv_colorkey; + xswamask |= CWBackPixel; + } vo_x11_create_vo_window(vo, &vinfo, vo->dx, vo->dy, vo->dwidth, vo->dheight, flags, CopyFromParent, "xv", |