summaryrefslogtreecommitdiffstats
path: root/audio/out/ao_pulse.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-10 23:15:02 +0100
committerwm4 <wm4@nowhere>2013-11-12 23:16:31 +0100
commitbf60281ffb6f47986fa6ef9ee559689be0075050 (patch)
tree28c3472d90683ddc6f374f4d6fa50cee0df30f15 /audio/out/ao_pulse.c
parentd2e7467eb203d3a34bc1111564c7058b5e9c6b12 (diff)
downloadmpv-bf60281ffb6f47986fa6ef9ee559689be0075050.tar.bz2
mpv-bf60281ffb6f47986fa6ef9ee559689be0075050.tar.xz
audio/out: reject non-interleaved formats
No AO can handle these, so it would be a problem if they get added later, and non-interleaved formats get accepted erroneously. Let them gracefully fall back to other formats. Most AOs actually would fall back, but to an unrelated formats. This is covered by this commit too, and if possible they should pick the interleaved variant if a non-interleaved format is requested.
Diffstat (limited to 'audio/out/ao_pulse.c')
-rw-r--r--audio/out/ao_pulse.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c
index a4da2a179b..1d7fcdd382 100644
--- a/audio/out/ao_pulse.c
+++ b/audio/out/ao_pulse.c
@@ -286,6 +286,8 @@ static int init(struct ao *ao)
ss.channels = ao->channels.num;
ss.rate = ao->samplerate;
+ ao->format = af_fmt_from_planar(ao->format);
+
const struct format_map *fmt_map = format_maps;
while (fmt_map->mp_format != ao->format) {
if (fmt_map->mp_format == AF_FORMAT_UNKNOWN) {