# HG changeset patch
# User al
# Date 1113666723 0
# Node ID 8abf1eed90f38509b0f5d1f14bc8c64bd95e158f
# Parent  b7c105c59e2dfe1e41f3fb49f934ebd13ff9e45d
- fix black screen problem on reinit
- disable colorkey autopainting when painting it manually

diff -r b7c105c59e2d -r 8abf1eed90f3 libvo/vo_xv.c
--- a/libvo/vo_xv.c	Sat Apr 16 15:17:57 2005 +0000
+++ b/libvo/vo_xv.c	Sat Apr 16 15:52:03 2005 +0000
@@ -426,7 +426,6 @@
 
     panscan_calc();
 
-    XClearWindow(mDisplay, vo_window);
 #if 0
 #ifdef HAVE_SHM
     if (Shmem_Flag)
diff -r b7c105c59e2d -r 8abf1eed90f3 libvo/x11_common.c
--- a/libvo/x11_common.c	Sat Apr 16 15:17:57 2005 +0000
+++ b/libvo/x11_common.c	Sat Apr 16 15:52:03 2005 +0000
@@ -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
   {