From c2220c526d6ce49c724059403e6e408b438013b6 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 2 Nov 2015 23:56:35 +0100 Subject: ao_alsa: apply non-NA fallback only if input is stereo Doesn't matter much; effectively this prevents just log spam in some cases where the map is legitimately padded. Normally this is really only needed for the dmix ALSA case. (See git blame for details.) --- audio/out/ao_alsa.c | 1 + 1 file changed, 1 insertion(+) (limited to 'audio') diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index 75a11a85c3..05fc4086cb 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -627,6 +627,7 @@ static int init_device(struct ao *ao, bool second_try) if (mp_chmap_is_valid(&without_na) && !mp_chmap_equals(&without_na, &chmap) && !mp_chmap_equals(&chmap, &ao->channels) && + without_na.num <= 2 && !second_try) { // Sometimes, ALSA will advertise certain chmaps, but it's not -- cgit v1.2.3