summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-11-02 23:56:35 +0100
committerwm4 <wm4@nowhere>2015-11-03 00:23:28 +0100
commitc2220c526d6ce49c724059403e6e408b438013b6 (patch)
tree74ed28d27425974e10d0bdd4c8f90d922bc64d21 /audio
parentb58e4abc01ea3f9a58fdeb4843b3c69ee88e1ff6 (diff)
downloadmpv-c2220c526d6ce49c724059403e6e408b438013b6.tar.bz2
mpv-c2220c526d6ce49c724059403e6e408b438013b6.tar.xz
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.)
Diffstat (limited to 'audio')
-rw-r--r--audio/out/ao_alsa.c1
1 files changed, 1 insertions, 0 deletions
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