From b9d65a192a9654f5085ae13c411954f1d7d4f5db Mon Sep 17 00:00:00 2001 From: waker Date: Sat, 27 Nov 2010 22:24:56 +0100 Subject: fixed vorbis multichannel remapping --- plugins/vorbis/vorbis.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/vorbis') diff --git a/plugins/vorbis/vorbis.c b/plugins/vorbis/vorbis.c index f4cb3f3b..a966add0 100644 --- a/plugins/vorbis/vorbis.c +++ b/plugins/vorbis/vorbis.c @@ -320,7 +320,7 @@ cvorbis_read (DB_fileinfo_t *_info, char *bytes, int size) { endianess = 1; #endif - if (_info->fmt.channels <= 2) { + if (_info->fmt.channels <= 2 || _info->fmt.channels == 4) { ret=ov_read (&info->vorbis_file, bytes, size, endianess, 2, 1, &info->cur_bit_stream); } else { @@ -331,7 +331,7 @@ cvorbis_read (DB_fileinfo_t *_info, char *bytes, int size) { int idx = _info->fmt.channels - 3; static int remap[4][6] = { {0,2,1}, - {0,1,2,3}, + {0,1,2,3}, // should not be used {0,2,1,3,4}, {0,2,1,4,5,3} }; -- cgit v1.2.3