diff options
| author | wm4 <wm4@nowhere> | 2014-06-10 22:41:14 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-06-11 00:39:13 +0200 |
| commit | fd5207f56d13f70a7750ac457dc5efdb514d9845 (patch) | |
| tree | d2ff38fb1e1837467d25a5e4326c1ab695a8437a /video/out | |
| parent | 2fc3be582c8c5aa510c92c7602ce72d5a1daa0ed (diff) | |
| download | mpv-fd5207f56d13f70a7750ac457dc5efdb514d9845.tar.bz2 mpv-fd5207f56d13f70a7750ac457dc5efdb514d9845.tar.xz | |
options: remove global variables for swscale options; rename them
Additionally to removing the global variables, this makes the options
more uniform. --ssf-... becomes --sws-..., and --sws becomes --sws-
scaler. For --sws-scaler, use choices instead of magic integer values.
Diffstat (limited to 'video/out')
| -rw-r--r-- | video/out/vo_wayland.c | 2 | ||||
| -rw-r--r-- | video/out/vo_x11.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/video/out/vo_wayland.c b/video/out/vo_wayland.c index 54376d7e6d..7776bf4d4d 100644 --- a/video/out/vo_wayland.c +++ b/video/out/vo_wayland.c @@ -510,7 +510,7 @@ static bool resize(struct priv *p) if (y != 0) y = wl->window.height - p->dst_h; - mp_sws_set_from_cmdline(p->sws); + mp_sws_set_from_cmdline(p->sws, p->vo->opts->sws_opts); p->sws->src = p->in_format; p->sws->dst = (struct mp_image_params) { .imgfmt = p->video_format->mp_fmt, diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c index a8b37d4016..26af641dbb 100644 --- a/video/out/vo_x11.c +++ b/video/out/vo_x11.c @@ -370,7 +370,7 @@ static bool resize(struct vo *vo) } p->bpp = p->myximage[0]->bits_per_pixel; - mp_sws_set_from_cmdline(p->sws); + mp_sws_set_from_cmdline(p->sws, vo->opts->sws_opts); p->sws->src = p->in_format; p->sws->dst = (struct mp_image_params) { .imgfmt = fmte->mpfmt, |