diff options
| author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-23 15:25:10 +0000 |
|---|---|---|
| committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-23 15:25:10 +0000 |
| commit | 37584f552e5935439f57ef330c8472d2c489c4af (patch) | |
| tree | d2496e8136bef3ba2563c465f32ee5b3ec7bdc57 | |
| parent | db1aa87238a50b5ff5fdda7750d60139cdea4f56 (diff) | |
| download | mpv-37584f552e5935439f57ef330c8472d2c489c4af.tar.bz2 mpv-37584f552e5935439f57ef330c8472d2c489c4af.tar.xz | |
10l to whoever got aspect upside-down.. it's w/h, not h/w. hope this doesn't bother anyone already using it too much
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16838 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 4 | ||||
| -rw-r--r-- | libmpcodecs/vf_expand.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 15e6a0c55d..a1c7c19f8f 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -4431,9 +4431,9 @@ Expands to fit an aspect instead of a resolution (default: 0). .I EXAMPLE: .PD 0 .RSs -.IP expand=800::::3/4 +.IP expand=800::::4/3 Expands to 800x600, unless the source is higher resolution, in which -case it expands to fill a 3/4 aspect. +case it expands to fill a 4/3 aspect. .RE .PD 1 .IPs <r>\ \ diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c index 946f84fc19..ab7b71aff0 100644 --- a/libmpcodecs/vf_expand.c +++ b/libmpcodecs/vf_expand.c @@ -183,10 +183,10 @@ static int config(struct vf_instance_s* vf, else if( vf->priv->exp_h<height ) vf->priv->exp_h=height; #endif if (vf->priv->aspect) { - if (vf->priv->exp_h < vf->priv->exp_w * vf->priv->aspect) { - vf->priv->exp_h = vf->priv->exp_w * vf->priv->aspect; + if (vf->priv->exp_h < vf->priv->exp_w / vf->priv->aspect) { + vf->priv->exp_h = vf->priv->exp_w / vf->priv->aspect; } else { - vf->priv->exp_w = vf->priv->exp_h / vf->priv->aspect; + vf->priv->exp_w = vf->priv->exp_h * vf->priv->aspect; } } if (vf->priv->round > 1) { // round up. |