From 593dda77e9cc6b7033f7e709a2f6e937066f4b21 Mon Sep 17 00:00:00 2001
From: michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 24 Feb 2006 15:22:59 +0000
Subject: 10l (dont limit dimension components independantly if noup)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17675 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpcodecs/vf_scale.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c
index db977aeae8..9bdee31a38 100644
--- a/libmpcodecs/vf_scale.c
+++ b/libmpcodecs/vf_scale.c
@@ -146,10 +146,10 @@ static int config(struct vf_instance_s* vf,
     }
 
     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) {
-- 
cgit v1.2.3