--- vo_xv_old.c	Thu Jun 13 02:13:48 2002
+++ vo_xv.c	Thu Jun 13 02:14:50 2002
@@ -355,7 +355,6 @@
 #endif
  flip_flag=flags&8;
  num_buffers=vo_doublebuffering?NUM_BUFFERS:1;
-
    /* check image formats */
      fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats);
      xv_format=0;
@@ -429,6 +428,7 @@
         XUnmapWindow( mDisplay,vo_window );
         XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa );
 	XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask );
+	XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&vo_dwidth,&vo_dheight,&drwBorderWidth,&drwDepth );
         XMapWindow( mDisplay,vo_window );
        } else { drwX=vo_dx; drwY=vo_dy; }
     } else 
@@ -488,7 +488,9 @@
 
      set_gamma_correction();
 
-     aspect(&vo_dwidth,&vo_dheight,A_NOZOOM);
+     if ( !WinID ){
+      aspect(&vo_dwidth,&vo_dheight,A_NOZOOM);
+     }
      if ( ( flags&1 )&&( !WinID ) )
       {
        aspect(&vo_dwidth,&vo_dheight,A_ZOOM);