From 185c88143f69d3f50ef5c181f61deeb8c7b5ca41 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Fri, 17 Apr 2009 20:44:35 +0300 Subject: [PATCH] XCB: no need to create a color map for default visual --- modules/video_output/xcb/x11.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c index c794d334b8..155cae1c88 100644 --- a/modules/video_output/xcb/x11.c +++ b/modules/video_output/xcb/x11.c @@ -259,9 +259,14 @@ static int Open (vlc_object_t *obj) p_sys->bpp, p_sys->pad); /* Create colormap (needed to select non-default visual) */ - p_sys->cmap = xcb_generate_id (p_sys->conn); - xcb_create_colormap (p_sys->conn, XCB_COLORMAP_ALLOC_NONE, - p_sys->cmap, scr->root, p_sys->vid); + if (p_sys->vid != scr->root_visual) + { + p_sys->cmap = xcb_generate_id (p_sys->conn); + xcb_create_colormap (p_sys->conn, XCB_COLORMAP_ALLOC_NONE, + p_sys->cmap, scr->root, p_sys->vid); + } + else + p_sys->cmap = scr->default_colormap; /* Check shared memory support */ p_sys->shm = var_CreateGetBool (vout, "x11-shm") > 0; -- 2.39.2