RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-23 03:37:27 +00:00
Code Issues Releases Wiki Activity

audio: fix off by one error in channel map selection code

Browse Source 
The consequence was that some AOs (like ao_jack) could not output 8
channels.

Fixes #1688.
This commit is contained in:
wm4 2015-03-15 17:07:06 +01:00
parent fadf03354e
commit c4f4b09014
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/chmap_sel.c
View File

@ -74,7 +74,7 @@ void mp_chmap_sel_add_waveext(struct mp_chmap_sel *s)
// Classic ALSA-based MPlayer layouts. // Classic ALSA-based MPlayer layouts.
void mp_chmap_sel_add_alsa_def(struct mp_chmap_sel *s) 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; struct mp_chmap t;
mp_chmap_from_channels_alsa(&t, n); mp_chmap_from_channels_alsa(&t, n);
if (t.num) 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. // Allow all waveext formats in default order.
void mp_chmap_sel_add_waveext_def(struct mp_chmap_sel *s) 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; struct mp_chmap map;
mp_chmap_from_channels(&map, n); mp_chmap_from_channels(&map, n);
mp_chmap_sel_add_map(s, &map); mp_chmap_sel_add_map(s, &map);