Mercurial > mplayer.hg

changeset 22468:ce47c5e803e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
100l, last patch broke window resizing with xv and xvmc.
author reimar
date Thu, 08 Mar 2007 09:42:14 +0000
parents 7336cfb3b88f
children 93bb02dad435
files libvo/vo_xv.c libvo/vo_xvmc.c
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_xv.c	Wed Mar 07 12:41:03 2007 +0000
+++ b/libvo/vo_xv.c	Thu Mar 08 09:42:14 2007 +0000
@@ -144,7 +144,6 @@
 
 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 @@
     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 @@
     {
         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);
 
--- a/libvo/vo_xvmc.c	Wed Mar 07 12:41:03 2007 +0000
+++ b/libvo/vo_xvmc.c	Thu Mar 08 09:42:14 2007 +0000
@@ -425,7 +425,6 @@
 
 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 @@
 #endif
    }
 
+   aspect(&vo_dwidth, &vo_dheight, A_NOZOOM);
    if ((flags & VOFLAG_FULLSCREEN) && WinID <= 0) vo_fs = 1;
    calc_drwXY(&drwX, &drwY);