From 835586513d026bcf1e7dec4693e07c28dda8cedd Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 31 Oct 2019 15:18:57 +0100 Subject: sws_utils: shuffle around some shit Purpose uncertain. I guess it's slightly better, maybe. The move of the sws/zimg options from VO opts (vo_opt_list) to the top-level option list is tricky. VO opts have some helper code in vo.c, that sends VOCTRL_SET_PANSCAN to the VO on every VO opts change. That's because updating certain VO options used to be this way (and not just the panscan option). This isn't needed anymore for sws/zimg options, so explicitly move them away. --- options/options.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'options/options.h') diff --git a/options/options.h b/options/options.h index c0f01ae5dc..441d06b285 100644 --- a/options/options.h +++ b/options/options.h @@ -55,9 +55,6 @@ typedef struct mp_vo_opts { double override_display_fps; double timing_offset; - struct sws_opts *sws_opts; - struct zimg_opts *zimg_opts; - // vo_drm struct drm_opts *drm_opts; @@ -339,6 +336,8 @@ typedef struct MPOpts { struct wayland_opts *wayland_opts; struct dvd_opts *dvd_opts; struct vaapi_opts *vaapi_opts; + struct sws_opts *sws_opts; + struct zimg_opts *zimg_opts; int cuda_device; } MPOpts; -- cgit v1.2.3