From 9577838f2f5439a8dd50ec549d6e21cf88e71b02 Mon Sep 17 00:00:00 2001
From: James Darnley <james.darnley@gmail.com>
Date: Sun, 27 Jun 2010 09:25:05 +0000
Subject: Fix libvorbis encoding with more than 2 channels Fixes issue 1325.

Patch by James Darnley, james dot darnley at gmail

Originally committed as revision 23818 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/vorbis_data.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'libavcodec/vorbis_data.c')

diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c
index 9bc7979cdf..c504664aae 100644
--- a/libavcodec/vorbis_data.c
+++ b/libavcodec/vorbis_data.c
@@ -32,6 +32,17 @@ const uint8_t ff_vorbis_channel_layout_offsets[8][8] = {
     { 0, 2, 1, 7, 5, 6, 3, 4},
 };
 
+const uint8_t ff_vorbis_encoding_channel_layout_offsets[8][8] = {
+    { 0, },
+    { 0, 1, },
+    { 0, 2, 1, },
+    { 0, 1, 2, 3, },
+    { 0, 2, 1, 3, 4, },
+    { 0, 2, 1, 4, 5, 3, },
+    { 0, 2, 1, 5, 6, 4, 3, },
+    { 0, 2, 1, 6, 7, 4, 5, 3 }
+};
+
 const int64_t ff_vorbis_channel_layouts[9] = {
     CH_LAYOUT_MONO,
     CH_LAYOUT_STEREO,
-- 
cgit v1.2.3