[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.124,1.125

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv5045

Modified Files:
	vo_x11.c 
Log Message:
MPlayer crash when using -wid and -vo x11 parameters.
I don't understand very well why my fix works.
Jouni Tulkki <jitulkki at cc.hut.fi>


Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- vo_x11.c	11 Nov 2002 15:20:26 -0000	1.124
+++ vo_x11.c	26 Jan 2003 22:24:17 -0000	1.125
@@ -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,