summaryrefslogtreecommitdiffstats
path: root/video/out/vo_opengl.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-31 20:45:06 +0200
committerwm4 <wm4@nowhere>2013-07-31 20:56:00 +0200
commitd1de1e090f91a254f066505ee5811feda4d93dde (patch)
tree154365282fb60ceea2f44951fb96a9b48c044ad2 /video/out/vo_opengl.c
parentd6592dd2e209ea6b10231206e8b5d856bef8afaa (diff)
downloadmpv-d1de1e090f91a254f066505ee5811feda4d93dde.tar.bz2
mpv-d1de1e090f91a254f066505ee5811feda4d93dde.tar.xz
options: handle presets directly in m_config
This means that "mpv -vo opengl-hq:help" will actually show the correct defaults, instead those of plain vo_opengl.
Diffstat (limited to 'video/out/vo_opengl.c')
-rw-r--r--video/out/vo_opengl.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 2a2dbf9e21..ee9c2a06ee 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -199,11 +199,9 @@ static bool reparse_cmdline(struct gl_priv *p, char *args)
opts = p->renderer_opts;
} else {
cfg = m_config_new(NULL, sizeof(*opts), gl_video_conf.defaults,
- gl_video_conf.opts);
+ gl_video_conf.opts,
+ p->vo->driver->init_option_string);
opts = cfg->optstruct;
- const char *init = p->vo->driver->init_option_string;
- if (init)
- m_config_parse_suboptions(cfg, "opengl", (char *)init);
r = m_config_parse_suboptions(cfg, "opengl", args);
}