diff options
| author | wm4 <wm4@nowhere> | 2019-10-31 15:18:57 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2019-10-31 15:26:03 +0100 |
| commit | 835586513d026bcf1e7dec4693e07c28dda8cedd (patch) | |
| tree | f96ce1fe2e8a474906ae09e9c9146d6e88030fd4 /options/options.c | |
| parent | c10ba5eb8e62d04ed80cad512cf4863dadee07f1 (diff) | |
| download | mpv-835586513d026bcf1e7dec4693e07c28dda8cedd.tar.bz2 mpv-835586513d026bcf1e7dec4693e07c28dda8cedd.tar.xz | |
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.
Diffstat (limited to 'options/options.c')
| -rw-r--r-- | options/options.c | 10 |
1 files changed, 6 insertions, 4 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"), |