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
This commit is contained in:
reimar 2007-03-08 09:42:14 +00:00
parent 9a4588b2bf
commit 61ee6f358f
2 changed files with 2 additions and 3 deletions

View File

@ -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);

View File

@ -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);