diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-24 15:22:59 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-24 15:22:59 +0000 |
| commit | 593dda77e9cc6b7033f7e709a2f6e937066f4b21 (patch) | |
| tree | 19694a1cfc74b9d8fad70cdf2680460f6ddf3a6f /libmpcodecs | |
| parent | 0b8f7c264e57ed0ca6309c3c2ab157561201c23b (diff) | |
| download | mpv-593dda77e9cc6b7033f7e709a2f6e937066f4b21.tar.bz2 mpv-593dda77e9cc6b7033f7e709a2f6e937066f4b21.tar.xz | |
10l (dont limit dimension components independantly if noup)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17675 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_scale.c | 4 |
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) { |