Mercurial > mplayer.hg

changeset 17674:0f314c38ce57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
10l (dont limit dimension components independantly if noup)
author michael
date Fri, 24 Feb 2006 15:22:59 +0000
parents f49584fc65c7
children e735c3f740ba
files libmpcodecs/vf_scale.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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) {