diff options
| author | wm4 <wm4@nowhere> | 2013-07-22 22:52:42 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-22 22:52:42 +0200 |
| commit | 1f5ffe7d30a5537cc83fbfb8dad37d01af27427b (patch) | |
| tree | 7e450c6208e14a2c4fe71e14461469c8fab1b7c8 /video/out/vo.c | |
| parent | 1df2ad7e034c1c42a8ae86e8b3077c2342ad40bd (diff) | |
| download | mpv-1f5ffe7d30a5537cc83fbfb8dad37d01af27427b.tar.bz2 mpv-1f5ffe7d30a5537cc83fbfb8dad37d01af27427b.tar.xz | |
video/out: remove options argument from preinit()
All VOs use proper option parsing now, and compatibility hacks are not
needed.
Diffstat (limited to 'video/out/vo.c')
| -rw-r--r-- | video/out/vo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/video/out/vo.c b/video/out/vo.c index 474d4e0c52..2db6afa05a 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -157,9 +157,10 @@ static struct vo *vo_create(struct mp_vo_opts *opts, if (vo->driver->encode != !!vo->encode_lavc_ctx) goto error; struct m_config *config = m_config_from_obj_desc(vo, &desc); - if (m_config_initialize_obj(config, &desc, &vo->priv, &args) < 0) + if (m_config_set_obj_params(config, args) < 0) goto error; - if (vo->driver->preinit(vo, (char *)args)) + vo->priv = config->optstruct; + if (vo->driver->preinit(vo)) goto error; return vo; error: |