diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-08 09:42:14 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-08 09:42:14 +0000 |
| commit | 61ee6f358ffe036efa70387faf2e3991be4a32d2 (patch) | |
| tree | 1e5e1afafe9a51c45e8f41b7975cff8b0281e52c | |
| parent | 9a4588b2bf58c38b0584476baa862af65953d214 (diff) | |
| download | mpv-61ee6f358ffe036efa70387faf2e3991be4a32d2.tar.bz2 mpv-61ee6f358ffe036efa70387faf2e3991be4a32d2.tar.xz | |
100l, last patch broke window resizing with xv and xvmc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22486 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libvo/vo_xv.c | 3 | ||||
| -rw-r--r-- | libvo/vo_xvmc.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index c41b1993c8..8a7101d96d 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -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_t height, uint32_t d_width, 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); diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index ef01dce5cc..79c03da5b4 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -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); |