summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-04 11:33:24 +0200
committerwm4 <wm4@nowhere>2012-08-04 19:59:56 +0200
commit6031b8e22ce34754218ddcd98d4758ab46d647b8 (patch)
treee2aad57ded8184bb538841c145c99c22983d501d /libvo
parent37c03f2c81a443e910eeb3b2613865dce59c54bf (diff)
downloadmpv-6031b8e22ce34754218ddcd98d4758ab46d647b8.tar.bz2
mpv-6031b8e22ce34754218ddcd98d4758ab46d647b8.tar.xz
m_config: implement m_config_new in terms of m_config_simple
Also change m_config_simple() such that you need to register options using m_config_register_options().
Diffstat (limited to 'libvo')
-rw-r--r--libvo/video_out.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 0466ec5fad..e81026cd52 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -175,8 +175,9 @@ static int vo_preinit(struct vo *vo, char *arg)
if (vo->driver->privsize)
vo->priv = talloc_zero_size(vo, vo->driver->privsize);
if (vo->driver->options) {
- struct m_config *cfg = m_config_simple(vo->driver->options, vo->priv);
+ struct m_config *cfg = m_config_simple(vo->priv);
talloc_steal(vo->priv, cfg);
+ m_config_register_options(cfg, vo->driver->options);
char n[50];
int l = snprintf(n, sizeof(n), "vo/%s", vo->driver->info->short_name);
assert(l < sizeof(n));