summaryrefslogtreecommitdiffstats
path: root/audio/out/ao_alsa.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_alsa.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_alsa.c')
-rw-r--r--audio/out/ao_alsa.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c
index 910ac98437..01414d63fc 100644
--- a/audio/out/ao_alsa.c
+++ b/audio/out/ao_alsa.c
@@ -317,10 +317,8 @@ static const char *select_chmap(struct ao *ao)
return device_channel_layouts[n][0];
}
- char *name = mp_chmap_to_str(&ao->channels);
MP_ERR(ao, "channel layout %s (%d ch) not supported.\n",
- name, ao->channels.num);
- talloc_free(name);
+ mp_chmap_to_str(&ao->channels), ao->channels.num);
return "default";
}
@@ -587,9 +585,7 @@ static int init(struct ao *ao)
for (int c = 0; c < chmap.num; c++)
chmap.speaker[c] = find_mp_channel(alsa_chmap->pos[c]);
- char *mp_map_str = mp_chmap_to_str(&chmap);
- MP_VERBOSE(ao, "which we understand as: %s\n", mp_map_str);
- talloc_free(mp_map_str);
+ MP_VERBOSE(ao, "which we understand as: %s\n", mp_chmap_to_str(&chmap));
if (mp_chmap_is_valid(&chmap) && chmap.num == ao->channels.num) {
MP_VERBOSE(ao, "using the ALSA channel map.\n");