diff options
| author | wm4 <wm4@nowhere> | 2015-03-15 17:07:06 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-03-15 17:07:06 +0100 |
| commit | c4f4b0901496411c93647e36042128b08f5d153d (patch) | |
| tree | fd684e5d6830baa8f6c2d543da3a1ff030c63a84 /audio | |
| parent | fadf03354ebbdd900eec0670eaad1ee309a43d96 (diff) | |
| download | mpv-c4f4b0901496411c93647e36042128b08f5d153d.tar.bz2 mpv-c4f4b0901496411c93647e36042128b08f5d153d.tar.xz | |
audio: fix off by one error in channel map selection code
The consequence was that some AOs (like ao_jack) could not output 8
channels.
Fixes #1688.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/chmap_sel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/chmap_sel.c b/audio/chmap_sel.c index 23ebe71710..515190e14d 100644 --- a/audio/chmap_sel.c +++ b/audio/chmap_sel.c @@ -74,7 +74,7 @@ void mp_chmap_sel_add_waveext(struct mp_chmap_sel *s) // Classic ALSA-based MPlayer layouts. void mp_chmap_sel_add_alsa_def(struct mp_chmap_sel *s) { - for (int n = 0; n < MP_NUM_CHANNELS; n++) { + for (int n = 1; n <= MP_NUM_CHANNELS; n++) { struct mp_chmap t; mp_chmap_from_channels_alsa(&t, n); if (t.num) @@ -102,7 +102,7 @@ void mp_chmap_sel_add_map(struct mp_chmap_sel *s, const struct mp_chmap *map) // Allow all waveext formats in default order. void mp_chmap_sel_add_waveext_def(struct mp_chmap_sel *s) { - for (int n = 1; n < MP_NUM_CHANNELS; n++) { + for (int n = 1; n <= MP_NUM_CHANNELS; n++) { struct mp_chmap map; mp_chmap_from_channels(&map, n); mp_chmap_sel_add_map(s, &map); |