diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 19:45:42 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 21:05:02 +0100 |
| commit | d8d42b44fc717c695af59c14213d54885088ea37 (patch) | |
| tree | 9dbfd597e3352249cb5d1fda996d2c0ce1602fe9 /video | |
| parent | a2d144fc8f146f96e4fe97b1b2c15828e24f8494 (diff) | |
| download | mpv-d8d42b44fc717c695af59c14213d54885088ea37.tar.bz2 mpv-d8d42b44fc717c695af59c14213d54885088ea37.tar.xz | |
m_option, m_config: mp_msg conversions
Always pass around mp_log contexts in the option parser code. This of
course affects all users of this API as well.
In stream.c, pass a mp_null_log, because we can't do it properly yet.
This will be fixed later.
Diffstat (limited to 'video')
| -rw-r--r-- | video/filter/vf.c | 2 | ||||
| -rw-r--r-- | video/out/vo.c | 2 | ||||
| -rw-r--r-- | video/out/vo_opengl.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/video/filter/vf.c b/video/filter/vf.c index c2d4be6e63..13d1026b74 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -237,7 +237,7 @@ static struct vf_instance *vf_open(struct vf_chain *c, const char *name, .query_format = vf_default_query_format, .out_pool = talloc_steal(vf, mp_image_pool_new(16)), }; - struct m_config *config = m_config_from_obj_desc(vf, &desc); + struct m_config *config = m_config_from_obj_desc(vf, vf->log, &desc); if (m_config_apply_defaults(config, name, c->opts->vf_defs) < 0) goto error; if (m_config_set_obj_params(config, args) < 0) diff --git a/video/out/vo.c b/video/out/vo.c index c66478bc6d..0222770131 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -171,7 +171,7 @@ static struct vo *vo_create(struct mpv_global *global, }; if (vo->driver->encode != !!vo->encode_lavc_ctx) goto error; - struct m_config *config = m_config_from_obj_desc(vo, &desc); + struct m_config *config = m_config_from_obj_desc(vo, vo->log, &desc); if (m_config_apply_defaults(config, name, vo->opts->vo_defs) < 0) goto error; if (m_config_set_obj_params(config, args) < 0) diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index dea9f28266..8fea170a55 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -274,7 +274,8 @@ static bool reparse_cmdline(struct gl_priv *p, char *args) const struct gl_priv *vodef = p->vo->driver->priv_defaults; const struct gl_video_opts *def = vodef ? vodef->renderer_opts : gl_video_conf.defaults; - cfg = m_config_new(NULL, sizeof(*opts), def, gl_video_conf.opts); + cfg = m_config_new(NULL, p->vo->log, sizeof(*opts), def, + gl_video_conf.opts); opts = cfg->optstruct; r = m_config_parse_suboptions(cfg, "opengl", args); } |