diff options
| author | wm4 <wm4@nowhere> | 2013-11-10 23:15:02 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-12 23:16:31 +0100 |
| commit | bf60281ffb6f47986fa6ef9ee559689be0075050 (patch) | |
| tree | 28c3472d90683ddc6f374f4d6fa50cee0df30f15 /audio/out/ao_dsound.c | |
| parent | d2e7467eb203d3a34bc1111564c7058b5e9c6b12 (diff) | |
| download | mpv-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_dsound.c')
| -rw-r--r-- | audio/out/ao_dsound.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c index 464947c0dc..58812d80e6 100644 --- a/audio/out/ao_dsound.c +++ b/audio/out/ao_dsound.c @@ -388,7 +388,7 @@ static int init(struct ao *ao) WAVEFORMATEXTENSIBLE wformat; DSBUFFERDESC dsbpridesc; DSBUFFERDESC dsbdesc; - int format = ao->format; + int format = af_fmt_from_planar(ao->format); int rate = ao->samplerate; if (AF_FORMAT_IS_AC3(format)) |