diff options
author | wm4 <wm4@nowhere> | 2013-07-22 22:57:51 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-22 22:58:09 +0200 |
commit | f32a90a8396136cdded09390b68c9aac3d29ee7e (patch) | |
tree | eeb5879ca68094308e9cfa51ef7e86e729111a2e /audio/out/ao.c | |
parent | 1f5ffe7d30a5537cc83fbfb8dad37d01af27427b (diff) | |
download | mpv-f32a90a8396136cdded09390b68c9aac3d29ee7e.tar.bz2 mpv-f32a90a8396136cdded09390b68c9aac3d29ee7e.tar.xz |
audio/out: remove options argument from init()
Same as with VOs in the previous commit.
Diffstat (limited to 'audio/out/ao.c')
-rw-r--r-- | audio/out/ao.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/audio/out/ao.c b/audio/out/ao.c index c7fd60a8f8..04e6fcda12 100644 --- a/audio/out/ao.c +++ b/audio/out/ao.c @@ -146,9 +146,10 @@ static struct ao *ao_create(bool probing, struct MPOpts *opts, if (ao->driver->encode != !!ao->encode_lavc_ctx) goto error; struct m_config *config = m_config_from_obj_desc(ao, &desc); - if (m_config_initialize_obj(config, &desc, &ao->priv, &args) < 0) + if (m_config_set_obj_params(config, args) < 0) goto error; - if (ao->driver->init(ao, (char *)args) < 0) + ao->priv = config->optstruct; + if (ao->driver->init(ao) < 0) goto error; ao->bps = ao->channels.num * ao->samplerate * af_fmt2bits(ao->format) / 8; return ao; |