summaryrefslogtreecommitdiffstats
path: root/video/out/vo.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-08-30 23:50:57 +0200
committerwm4 <wm4@nowhere>2016-08-30 23:50:57 +0200
commitaf1379c43d6a5274b75bce0adeef9e3a9ce87bdf (patch)
treeba90dc6c885374095a1051c8dde7f983eca7b7e9 /video/out/vo.c
parente65a8d7b61762ddf07825c59a6ebd47b026b0ea7 (diff)
downloadmpv-af1379c43d6a5274b75bce0adeef9e3a9ce87bdf.tar.bz2
mpv-af1379c43d6a5274b75bce0adeef9e3a9ce87bdf.tar.xz
options: make mp_vo_opts options an actual sub-option group
Just a minor refactor along the planned option change. This commit will make it easier to update (i.e. copy) the VO options without copying _all_ options. For now, behavior should be equivalent, though. (The VO options were put into a separate struct quite early - when all global variables were removed from the source code. It wasn't clear whether the separate struct would have any actual purpose, but it seems it will now. Awesome, huh.)
Diffstat (limited to 'video/out/vo.c')
-rw-r--r--video/out/vo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index 0d70106ed8..31a1e74405 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -224,7 +224,7 @@ static struct vo *vo_create(bool probing, struct mpv_global *global,
*vo = (struct vo) {
.log = mp_log_new(vo, log, name),
.driver = desc.p,
- .opts = &global->opts->vo,
+ .opts = global->opts->vo,
.global = global,
.encode_lavc_ctx = ex->encode_lavc_ctx,
.input_ctx = ex->input_ctx,
@@ -269,7 +269,7 @@ 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 m_obj_settings *vo_list = global->opts->vo->video_driver_list;
// 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++) {