summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-01 00:12:10 +0100
committerwm4 <wm4@nowhere>2013-12-01 00:12:10 +0100
commitb18f02d1ad5e5ce4031438f1cd0f1f3aaaf83003 (patch)
treeb723192a213fbdb0b64a742c91bc106237e5d539 /video
parentaaddcb702ef93eac9087852202a59f91abb31433 (diff)
downloadmpv-b18f02d1ad5e5ce4031438f1cd0f1f3aaaf83003.tar.bz2
mpv-b18f02d1ad5e5ce4031438f1cd0f1f3aaaf83003.tar.xz
options: add options that set defaults for af/vf/ao/vo
There are some use cases for this. For example, you can use it to set defaults of automatically inserted filters (like af_lavrresample). It's also useful if you have a non-trivial VO configuration, and want to use --vo to quickly change between the drivers without repeating the whole configuration in the --vo argument.
Diffstat (limited to 'video')
-rw-r--r--video/filter/vf.c2
-rw-r--r--video/out/vo.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/video/filter/vf.c b/video/filter/vf.c
index 212fc1d7a5..bbe0ef8534 100644
--- a/video/filter/vf.c
+++ b/video/filter/vf.c
@@ -251,6 +251,8 @@ static struct vf_instance *vf_open(struct MPOpts *opts, vf_instance_t *next,
.out_pool = talloc_steal(vf, mp_image_pool_new(16)),
};
struct m_config *config = m_config_from_obj_desc(vf, &desc);
+ if (m_config_apply_defaults(config, name, opts->vf_defs) < 0)
+ goto error;
void *priv = NULL;
if (m_config_initialize_obj(config, &desc, &priv, &args) < 0)
goto error;
diff --git a/video/out/vo.c b/video/out/vo.c
index 41a1b2a8ca..dc17a2bbb6 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -169,6 +169,8 @@ 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);
+ if (m_config_apply_defaults(config, name, vo->opts->vo_defs) < 0)
+ goto error;
if (m_config_set_obj_params(config, args) < 0)
goto error;
vo->priv = config->optstruct;