summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vf_scale.c4
1 files 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) {