summaryrefslogtreecommitdiffstats
path: root/audio/out/ao.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-24 19:56:01 +0100
committerwm4 <wm4@nowhere>2014-11-24 19:56:01 +0100
commit28b6ce39d3d88d0159b54c8ca558e993eac93056 (patch)
treefa3c94a84cd2efebf24b1ea5fd75dd1fbcc01c12 /audio/out/ao.c
parent2228d4737367fb0303bec263bc06ca90c9ff8757 (diff)
downloadmpv-28b6ce39d3d88d0159b54c8ca558e993eac93056.tar.bz2
mpv-28b6ce39d3d88d0159b54c8ca558e993eac93056.tar.xz
audio: make mp_chmap_to_str() return a stack-allocated string
Simplifies memory management.
Diffstat (limited to 'audio/out/ao.c')
-rw-r--r--audio/out/ao.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/audio/out/ao.c b/audio/out/ao.c
index f0461b8c09..893699e2f5 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -214,10 +214,9 @@ static struct ao *ao_alloc_pb(bool probing, struct mpv_global *global,
static int ao_init(struct ao *ao)
{
- char *chmap = mp_chmap_to_str(&ao->channels);
MP_VERBOSE(ao, "requested format: %d Hz, %s channels, %s\n",
- ao->samplerate, chmap, af_fmt_to_str(ao->format));
- talloc_free(chmap);
+ ao->samplerate, mp_chmap_to_str(&ao->channels),
+ af_fmt_to_str(ao->format));
ao->api = ao->driver->play ? &ao_api_push : &ao_api_pull;
ao->api_priv = talloc_zero_size(ao, ao->api->priv_size);