summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-20 16:48:30 +0100
committerwm4 <wm4@nowhere>2014-12-20 16:48:30 +0100
commit5b32f30aa102caabb9a2bb8b09bca008dab85b53 (patch)
tree5a4847607e2e8ab4f44c629d1eaddc2643da118f
parentd07c6566cd8e6fa01be7e8a1bd2e0334fee5e7df (diff)
downloadmpv-5b32f30aa102caabb9a2bb8b09bca008dab85b53.tar.bz2
mpv-5b32f30aa102caabb9a2bb8b09bca008dab85b53.tar.xz
audio: fix previous commit
This would have always forced mono first (if supported by the AO), instead of stereo.
-rw-r--r--audio/chmap_sel.c8
1 files 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;