# HG changeset patch
# User arpi
# Date 1043619857 0
# Node ID fc803aa850580ead21fcad8aca0cd59b00f935a4
# Parent  306ea9a02ebe5d276d11693b059902814d03343c
MPlayer crash when using -wid and -vo x11 parameters.
I don't understand very well why my fix works.
Jouni Tulkki <jitulkki@cc.hut.fi>

diff -r 306ea9a02ebe -r fc803aa85058 libvo/vo_x11.c
--- a/libvo/vo_x11.c	Sun Jan 26 22:05:18 2003 +0000
+++ b/libvo/vo_x11.c	Sun Jan 26 22:24:17 2003 +0000
@@ -298,8 +298,7 @@
 
     xswa.background_pixel=0;
     xswa.border_pixel=0;
-    xswa.colormap=theCmap;
-    xswamask=CWBackPixel | CWBorderPixel | CWColormap;
+    xswamask=CWBackPixel | CWBorderPixel;
 
 #ifdef HAVE_XF86VM
     if ( vm )
@@ -323,6 +322,8 @@
      {
       if ( vo_window == None )
        {
+        xswa.colormap=theCmap;
+        xswamask|=CWColormap;
         vo_window=XCreateWindow( mDisplay,mRootWin,
     			 vo_dx,vo_dy,
 			 vo_dwidth,vo_dheight,