From 5b32f30aa102caabb9a2bb8b09bca008dab85b53 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 20 Dec 2014 16:48:30 +0100 Subject: audio: fix previous commit This would have always forced mono first (if supported by the AO), instead of stereo. --- audio/chmap_sel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/chmap_sel.c b/audio/chmap_sel.c index 1c5b7919eb..fe0b9598a0 100644 --- a/audio/chmap_sel.c +++ b/audio/chmap_sel.c @@ -184,11 +184,11 @@ bool mp_chmap_sel_adjust(const struct mp_chmap_sel *s, struct mp_chmap *map) } } // Fallback to mono/stereo as last resort - *map = (struct mp_chmap) MP_CHMAP_INIT_MONO; - if (map->num == 1 && test_layout(s, map)) - return true; *map = (struct mp_chmap) MP_CHMAP_INIT_STEREO; - if (map->num >= 2 && test_layout(s, map)) + if (test_layout(s, map)) + return true; + *map = (struct mp_chmap) MP_CHMAP_INIT_MONO; + if (test_layout(s, map)) return true; *map = (struct mp_chmap) {0}; return false; -- cgit v1.2.3