From 4fa6bcbb902d500ca0a1b9d2feeab5a4e5a98345 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 2 Sep 2016 14:49:34 +0200 Subject: m_config: add helper function for initializing af/ao/vf/vo suboptions Normally I'd prefer a bunch of smaller functions with fewer parameters over a single function with a lot of parameters. But future changes will require messing with the parameters in a slightly more complex way, so a combined function will be needed anyway. The now-unused "global" parameter is required for later as well. --- video/filter/vf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'video/filter') diff --git a/video/filter/vf.c b/video/filter/vf.c index b632314426..93b886e69c 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -255,10 +255,10 @@ static struct vf_instance *vf_open(struct vf_chain *c, const char *name, .out_pool = talloc_steal(vf, mp_image_pool_new(16)), .chain = c, }; - 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) + struct m_config *config = + m_config_from_obj_desc_and_args(vf, vf->log, c->global, &desc, + name, c->opts->vf_defs, args); + if (!config) goto error; vf->priv = config->optstruct; int retcode = vf->info->open(vf); -- cgit v1.2.3