Index: libmpcodecs/vf_expand.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_expand.c,v
retrieving revision 1.33
diff -u -r1.33 vf_expand.c
--- libmpcodecs/vf_expand.c	18 Nov 2005 14:39:23 -0000	1.33
+++ libmpcodecs/vf_expand.c	21 Nov 2005 17:16:58 -0000
@@ -226,8 +226,8 @@
 	// try full DR !
 	mpi->priv=vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
 	    mpi->type, mpi->flags, 
-            MAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x), 
-            MAX(vf->priv->exp_h, mpi->height+vf->priv->exp_y));
+            MAX(vf->priv->exp_w, mpi->w+vf->priv->exp_x), 
+            MAX(vf->priv->exp_h, mpi->h+vf->priv->exp_y));
 #if 1
 	if((vf->dmpi->flags & MP_IMGFLAG_DRAW_CALLBACK) &&
 	  !(vf->dmpi->flags & MP_IMGFLAG_DIRECT)){
@@ -252,6 +252,7 @@
 	}
 	mpi->stride[0]=vf->dmpi->stride[0];
 	mpi->width=vf->dmpi->width;
+	mpi->height=vf->dmpi->height;
 	mpi->flags|=MP_IMGFLAG_DIRECT;
 	mpi->flags&=~MP_IMGFLAG_DRAW_CALLBACK;
 //	vf->dmpi->flags&=~MP_IMGFLAG_DRAW_CALLBACK;