summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
Diffstat (limited to 'options')
-rw-r--r--options/options.c10
-rw-r--r--options/options.h5
2 files changed, 8 insertions, 7 deletions
diff --git a/options/options.c b/options/options.c
index 862975ea48..9bac67101c 100644
--- a/options/options.c
+++ b/options/options.c
@@ -106,10 +106,6 @@ static const struct m_sub_options screenshot_conf = {
static const m_option_t mp_vo_opt_list[] = {
OPT_SETTINGSLIST("vo", video_driver_list, 0, &vo_obj_list, ),
- OPT_SUBSTRUCT("sws", sws_opts, sws_conf, 0),
-#if HAVE_ZIMG
- OPT_SUBSTRUCT("zimg", zimg_opts, zimg_conf, 0),
-#endif
OPT_FLAG("taskbar-progress", taskbar_progress, 0),
OPT_FLAG("snap-window", snap_window, 0),
OPT_FLAG("ontop", ontop, 0),
@@ -768,6 +764,12 @@ const m_option_t mp_opts[] = {
OPT_SUBSTRUCT("vaapi", vaapi_opts, vaapi_conf, 0),
#endif
+ OPT_SUBSTRUCT("sws", sws_opts, sws_conf, 0),
+
+#if HAVE_ZIMG
+ OPT_SUBSTRUCT("zimg", zimg_opts, zimg_conf, 0),
+#endif
+
OPT_SUBSTRUCT("", encode_opts, encode_config, 0),
OPT_REMOVED("a52drc", "use --ad-lavc-ac3drc=level"),
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;