# HG changeset patch
# User michael
# Date 1140794579 0
# Node ID 0f314c38ce574cccd428926beb63aae73aa22ad4
# Parent  f49584fc65c754c1419311985433c1a40778bdc7
10l (dont limit dimension components independantly if noup)

diff -r f49584fc65c7 -r 0f314c38ce57 libmpcodecs/vf_scale.c
--- a/libmpcodecs/vf_scale.c	Fri Feb 24 15:09:13 2006 +0000
+++ b/libmpcodecs/vf_scale.c	Fri Feb 24 15:22:59 2006 +0000
@@ -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) {