[vlc-commits] Fix vorbis channel order (which led to crash and contradicted spec)

[Cheng Sun]

vlc/vlc-1.2 | branch: master | Cheng Sun <chengsun9 at gmail.com> | Tue Dec 20 18:22:25 2011 +0000| [18fb8d765490071f43b1a06121b3884319f1a36b] | committer: Jean-Baptiste Kempf

Fix vorbis channel order (which led to crash and contradicted spec)

Close #5704

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 083e1bd921a3e68ddbe7e70dc718fa5f5b850dd8)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=18fb8d765490071f43b1a06121b3884319f1a36b
---

 modules/codec/vorbis.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index 6b42f98..3f4c802 100644
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -129,7 +129,7 @@ static const uint32_t pi_6channels_in[] =
 
 /* recommended vorbis channel order for 4 channels */
 static const uint32_t pi_4channels_in[] =
-{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 };
+{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, 0 };
 
 /* recommended vorbis channel order for 3 channels */
 static const uint32_t pi_3channels_in[] =