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_scale.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_scale.c')
| -rw-r--r-- | video/filter/vf_scale.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c index ca06436dd5..a81ed8c0cd 100644 --- a/video/filter/vf_scale.c +++ b/video/filter/vf_scale.c @@ -303,9 +303,6 @@ static int config(struct vf_instance *vf, return 0; } vf->priv->fmt=best; - - if (!opts->screen_size_x && !opts->screen_size_y - && !(opts->screen_size_xy >= 0.001)) { // Compute new d_width and d_height, preserving aspect // while ensuring that both are >= output size in pixels. if (vf->priv->h * d_width > vf->priv->w * d_height) { @@ -317,7 +314,6 @@ static int config(struct vf_instance *vf, } //d_width=d_width*vf->priv->w/width; //d_height=d_height*vf->priv->h/height; - } return vf_next_config(vf,vf->priv->w,vf->priv->h,d_width,d_height,flags,best); } |