Mercurial > mplayer.hg

changeset 9115:fc803aa85058

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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>
author arpi
date Sun, 26 Jan 2003 22:24:17 +0000
parents 306ea9a02ebe
children d7fb212b5505
files libvo/vo_x11.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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,