diff options
| author | wm4 <wm4@nowhere> | 2013-01-22 13:28:31 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-01-23 10:55:00 +0100 |
| commit | f2dcdca0c2dc5f904323659b65b29a2b6f00fd88 (patch) | |
| tree | 0ae1f6d9f1ef82e34795965327bb8ab076eb7b2c /video/filter/vf_expand.c | |
| parent | c9396c0aabb6c1b710e1cdaa3fb123182dc91279 (diff) | |
| download | mpv-f2dcdca0c2dc5f904323659b65b29a2b6f00fd88.tar.bz2 mpv-f2dcdca0c2dc5f904323659b65b29a2b6f00fd88.tar.xz | |
video: move handling of -x/-y/-xy options to VO
Now the calculations of the final display size are done after the filter
chain. This makes the difference between display aspect ratio and window
size a bit more clear, especially in the -xy case.
With an empty filter chain, the behavior of the options should be the
same, except that they don't affect vo_image and vo_lavc anymore.
Diffstat (limited to 'video/filter/vf_expand.c')
| -rw-r--r-- | video/filter/vf_expand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/filter/vf_expand.c b/video/filter/vf_expand.c index ff84d7670c..efe3f9dbb3 100644 --- a/video/filter/vf_expand.c +++ b/video/filter/vf_expand.c @@ -101,7 +101,7 @@ static int config(struct vf_instance *vf, vf->priv->exp_x = MP_ALIGN_DOWN(vf->priv->exp_x, fmt.align_x); vf->priv->exp_y = MP_ALIGN_DOWN(vf->priv->exp_y, fmt.align_y); - vf_rescale_dsize(vf, &d_width, &d_height, width, height, + vf_rescale_dsize(&d_width, &d_height, width, height, vf->priv->exp_w, vf->priv->exp_h); return vf_next_config(vf,vf->priv->exp_w,vf->priv->exp_h,d_width,d_height,flags,outfmt); |