diff options
Diffstat (limited to 'video')
-rw-r--r-- | video/out/gpu/video.c | 4 | ||||
-rw-r--r-- | video/out/vo.c | 18 |
2 files changed, 14 insertions, 8 deletions
diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c index 3fb460469d..46d9026742 100644 --- a/video/out/gpu/video.c +++ b/video/out/gpu/video.c @@ -3854,7 +3854,9 @@ static void reinit_from_options(struct gl_video *p) gl_video_setup_hooks(p); reinit_osd(p); - if (p->opts.interpolation && !p->global->opts->video_sync && !p->dsi_warned) { + int vs; + mp_read_option_raw(p->global, "video-sync", &m_option_type_choice, &vs); + if (p->opts.interpolation && !vs && !p->dsi_warned) { MP_WARN(p, "Interpolation now requires enabling display-sync mode.\n" "E.g.: --video-sync=display-resample\n"); p->dsi_warned = true; diff --git a/video/out/vo.c b/video/out/vo.c index 9ecfd76a1f..aa3e1b5a6a 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -332,7 +332,9 @@ error: struct vo *init_best_video_out(struct mpv_global *global, struct vo_extra *ex) { - struct m_obj_settings *vo_list = global->opts->vo->video_driver_list; + struct mp_vo_opts *opts = mp_get_config_group(NULL, global, &vo_sub_opts); + struct m_obj_settings *vo_list = opts->video_driver_list; + struct vo *vo = NULL; // first try the preferred drivers, with their optional subdevice param: if (vo_list && vo_list[0].name) { for (int n = 0; vo_list[n].name; n++) { @@ -340,11 +342,11 @@ struct vo *init_best_video_out(struct mpv_global *global, struct vo_extra *ex) if (strlen(vo_list[n].name) == 0) goto autoprobe; bool p = !!vo_list[n + 1].name; - struct vo *vo = vo_create(p, global, ex, vo_list[n].name); + vo = vo_create(p, global, ex, vo_list[n].name); if (vo) - return vo; + goto done; } - return NULL; + goto done; } autoprobe: // now try the rest... @@ -352,11 +354,13 @@ autoprobe: const struct vo_driver *driver = video_out_drivers[i]; if (driver == &video_out_null) break; - struct vo *vo = vo_create(true, global, ex, (char *)driver->name); + vo = vo_create(true, global, ex, (char *)driver->name); if (vo) - return vo; + goto done; } - return NULL; +done: + talloc_free(opts); + return vo; } static void terminate_vo(void *p) |