summaryrefslogtreecommitdiffstats
path: root/video/out/vo.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-03-01 21:19:20 +0100
committerwm4 <wm4@nowhere>2013-03-28 21:46:17 +0100
commit6ef06aa145067b816aaf3b941aba11e36bfca545 (patch)
tree116401ac1bc8fd443e936cd8ae5e8f1424afdd51 /video/out/vo.c
parent16e951c2cdfa6710f0d5cc77b513e0f2a5f1377d (diff)
downloadmpv-6ef06aa145067b816aaf3b941aba11e36bfca545.tar.bz2
mpv-6ef06aa145067b816aaf3b941aba11e36bfca545.tar.xz
vo_opengl: split into multiple files, convert to new option API
gl_video.c contains all rendering code, gl_lcms.c the .icc loader and creation of 3D LUT (and all LittleCMS specific code). vo_opengl.c is reduced to interfacing between the various parts.
Diffstat (limited to 'video/out/vo.c')
-rw-r--r--video/out/vo.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index 90497c48fd..fcc50713c9 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -119,9 +119,16 @@ static int vo_preinit(struct vo *vo, char *arg)
char n[50];
int l = snprintf(n, sizeof(n), "vo/%s", vo->driver->info->short_name);
assert(l < sizeof(n));
+ if (vo->driver->init_option_string) {
+ m_config_parse_suboptions(cfg, n,
+ (char *)vo->driver->init_option_string);
+ }
int r = m_config_parse_suboptions(cfg, n, arg);
- if (r < 0)
+ if (r < 0) {
+ if (vo->driver->help_text)
+ mp_msg(MSGT_VO, MSGL_FATAL, "%s\n", vo->driver->help_text);
return r;
+ }
}
return vo->driver->preinit(vo, arg);
}