[MPlayer-cvslog] CVS: main/libvo vo_xv.c, 1.161, 1.162 x11_common.c, 1.190, 1.191

[Alexander Strasser beastd]

CVS change done by Alexander Strasser (beastd)

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv15785/libvo

Modified Files:
	vo_xv.c x11_common.c 
Log Message:
- fix black screen problem on reinit
- disable colorkey autopainting when painting it manually


Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- vo_xv.c	24 Feb 2005 17:46:19 -0000	1.161
+++ vo_xv.c	16 Apr 2005 15:52:03 -0000	1.162
@@ -426,7 +426,6 @@
 
     panscan_calc();
 
-    XClearWindow(mDisplay, vo_window);
 #if 0
 #ifdef HAVE_SHM
     if (Shmem_Flag)

Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- x11_common.c	10 Apr 2005 16:02:28 -0000	1.190
+++ x11_common.c	16 Apr 2005 15:52:03 -0000	1.191
@@ -2407,11 +2407,12 @@
       }
     }
 
+    xv_atom = xv_intern_atom_if_exists( "XV_AUTOPAINT_COLORKEY" );    
+
     /* should we draw the colorkey ourselves or activate autopainting? */
     if ( xv_ck_info.method == CK_METHOD_AUTOPAINT )
     {
       rez = !Success; // reset rez to something different than Success
-      xv_atom = xv_intern_atom_if_exists( "XV_AUTOPAINT_COLORKEY" );
  
       if ( xv_atom != None ) // autopaint is supported
       {
@@ -2424,6 +2425,13 @@
         xv_ck_info.method = CK_METHOD_MANUALFILL;
       }
     }
+    else // disable colorkey autopainting if supported
+    {
+      if ( xv_atom != None ) // we have autopaint attribute
+      {
+        XvSetPortAttribute( mDisplay, xv_port, xv_atom, 0 );
+      }
+    }
   }
   else // do no colorkey drawing at all
   {