diff options
author | wm4 <wm4@nowhere> | 2018-01-16 11:49:23 +0100 |
---|---|---|
committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-01-18 00:59:07 -0800 |
commit | ca67928d7ab176c080a7e99f0d4ce0c5d1070844 (patch) | |
tree | b58c0101645ab42ad482a8cac9e5446df8133116 /video/out | |
parent | c59db62f510dcb7c4bdff0d35fb1cce2c3b2c7a5 (diff) | |
download | mpv-ca67928d7ab176c080a7e99f0d4ce0c5d1070844.tar.bz2 mpv-ca67928d7ab176c080a7e99f0d4ce0c5d1070844.tar.xz |
sws_utils: don't force callers to provide option struct
mp_sws_set_from_cmdline() has the only purpose to respect the --sws-
command line options. Instead of forcing callers to get the option
struct containing these, let callers pass mpv_global, and get it from
the option core code directly. This avoids minor annoyances later on.
Diffstat (limited to 'video/out')
-rw-r--r-- | video/out/vo_drm.c | 2 | ||||
-rw-r--r-- | video/out/vo_tct.c | 2 | ||||
-rw-r--r-- | video/out/vo_x11.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/video/out/vo_drm.c b/video/out/vo_drm.c index 24189d5b02..f32ed59b28 100644 --- a/video/out/vo_drm.c +++ b/video/out/vo_drm.c @@ -283,7 +283,7 @@ static int reconfig(struct vo *vo, struct mp_image_params *params) p->osd.mr = MPMIN(0, p->osd.mr); p->osd.ml = MPMIN(0, p->osd.ml); - mp_sws_set_from_cmdline(p->sws, vo->opts->sws_opts); + mp_sws_set_from_cmdline(p->sws, vo->global); p->sws->src = *params; p->sws->dst = (struct mp_image_params) { .imgfmt = IMGFMT, diff --git a/video/out/vo_tct.c b/video/out/vo_tct.c index dbe5d69fb6..6a07786996 100644 --- a/video/out/vo_tct.c +++ b/video/out/vo_tct.c @@ -207,7 +207,7 @@ static int reconfig(struct vo *vo, struct mp_image_params *params) if (p->buffer) free(p->buffer); - mp_sws_set_from_cmdline(p->sws, vo->opts->sws_opts); + mp_sws_set_from_cmdline(p->sws, vo->global); p->sws->src = *params; p->sws->dst = (struct mp_image_params) { .imgfmt = IMGFMT, diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c index 9c7595e1d8..13b22d1bfb 100644 --- a/video/out/vo_x11.c +++ b/video/out/vo_x11.c @@ -244,7 +244,7 @@ static bool resize(struct vo *vo) return -1; } - mp_sws_set_from_cmdline(p->sws, vo->opts->sws_opts); + mp_sws_set_from_cmdline(p->sws, vo->global); p->sws->dst = (struct mp_image_params) { .imgfmt = fmte->mpfmt, .w = p->dst_w, |