[MPlayer-cvslog] r22486 - in trunk/libvo: vo_xv.c vo_xvmc.c

[reimar]

Author: reimar
Date: Thu Mar  8 10:42:14 2007
New Revision: 22486

Modified:
   trunk/libvo/vo_xv.c
   trunk/libvo/vo_xvmc.c

Log:
100l, last patch broke window resizing with xv and xvmc.


Modified: trunk/libvo/vo_xv.c
==============================================================================
--- trunk/libvo/vo_xv.c	(original)
+++ trunk/libvo/vo_xv.c	Thu Mar  8 10:42:14 2007
@@ -144,7 +144,6 @@ static void deallocate_xvimage(int foo);
 
 static void calc_drwXY(uint32_t *drwX, uint32_t *drwY) {
   *drwX = *drwY = 0;
-  aspect(&vo_dwidth, &vo_dheight, A_NOZOOM);
   if (vo_fs) {
     aspect(&vo_dwidth, &vo_dheight, A_ZOOM);
     vo_dwidth = FFMIN(vo_dwidth, vo_screenwidth);
@@ -396,6 +395,7 @@ static int config(uint32_t width, uint32
     set_gamma_correction();
 #endif
 
+    aspect(&vo_dwidth, &vo_dheight, A_NOZOOM);
     if ((flags & VOFLAG_FULLSCREEN) && WinID <= 0) vo_fs = 1;
     calc_drwXY(&drwX, &drwY);
 
@@ -532,7 +532,6 @@ static void check_events(void)
     {
         XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &vo_dwidth,
                      &vo_dheight, &drwBorderWidth, &drwDepth);
-        drwX = drwY = 0;
         mp_msg(MSGT_VO, MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n", drwX,
                drwY, vo_dwidth, vo_dheight);
 

Modified: trunk/libvo/vo_xvmc.c
==============================================================================
--- trunk/libvo/vo_xvmc.c	(original)
+++ trunk/libvo/vo_xvmc.c	Thu Mar  8 10:42:14 2007
@@ -425,7 +425,6 @@ opt_t subopts [] =
 
 static void calc_drwXY(uint32_t *drwX, uint32_t *drwY) {
   *drwX = *drwY = 0;
-  aspect(&vo_dwidth, &vo_dheight, A_NOZOOM);
   if (vo_fs) {
     aspect(&vo_dwidth, &vo_dheight, A_ZOOM);
     vo_dwidth = FFMIN(vo_dwidth, vo_screenwidth);
@@ -736,6 +735,7 @@ skip_surface_allocation:
 #endif
    }
 
+   aspect(&vo_dwidth, &vo_dheight, A_NOZOOM);
    if ((flags & VOFLAG_FULLSCREEN) && WinID <= 0) vo_fs = 1;
    calc_drwXY(&drwX, &drwY);