From b18f02d1ad5e5ce4031438f1cd0f1f3aaaf83003 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 1 Dec 2013 00:12:10 +0100 Subject: 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. --- audio/filter/af.c | 2 ++ audio/filter/af.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'audio/filter') diff --git a/audio/filter/af.c b/audio/filter/af.c index 2cc6389841..f4da46d141 100644 --- a/audio/filter/af.c +++ b/audio/filter/af.c @@ -204,6 +204,8 @@ static struct af_instance *af_create(struct af_stream *s, char *name, .data = talloc_zero(af, struct mp_audio), }; struct m_config *config = m_config_from_obj_desc(af, &desc); + if (m_config_apply_defaults(config, name, s->opts->af_defs) < 0) + goto error; if (m_config_initialize_obj(config, &desc, &af->priv, &args) < 0) goto error; diff --git a/audio/filter/af.h b/audio/filter/af.h index 7dee490665..77f3bb4945 100644 --- a/audio/filter/af.h +++ b/audio/filter/af.h @@ -79,7 +79,6 @@ struct af_stream { struct af_instance *last; // The user sets the input format (what the decoder outputs), and sets some // or all fields in output to the output format the AO accepts. - // See fixup_output_format(). struct mp_audio input; struct mp_audio output; struct mp_audio filter_output; -- cgit v1.2.3