[MPlayer-cvslog] CVS: main/libmpcodecs vf_scale.c,1.63,1.64

[Michael Niedermayer CVS]

CVS change done by Michael Niedermayer CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv11714

Modified Files:
	vf_scale.c 
Log Message:
10l (dont limit dimension components independantly if noup)


Index: vf_scale.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_scale.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- vf_scale.c	18 Feb 2006 21:12:56 -0000	1.63
+++ vf_scale.c	24 Feb 2006 15:22:59 -0000	1.64
@@ -146,10 +146,10 @@
     }
 
     if(vf->priv->noup){
-        if(vf->priv->w > width)
+        if((vf->priv->w > width) + (vf->priv->h > height) >= vf->priv->noup){
             vf->priv->w= width;
-        if(vf->priv->h > height)
             vf->priv->h= height;
+        }
     }
 
     if (vf->priv->w <= -8) {