Add support for vorbis 6.1 and 7.1 channel configurations as per the new spec

http://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9

Originally committed as revision 21527 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 7 insertions, 3 deletions

diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c
index d9e3594ae8..2df8566631 100644
--- a/libavcodec/vorbis_data.c
+++ b/libavcodec/vorbis_data.c
@@ -21,22 +21,26 @@
 #include "dsputil.h"
 #include "vorbis.h"
 
-const uint8_t ff_vorbis_channel_layout_offsets[6][6] = {
+const uint8_t ff_vorbis_channel_layout_offsets[8][8] = {
     { 0, },
     { 0, 1, },
     { 0, 2, 1, },
     { 0, 1, 2, 3, },
     { 0, 2, 1, 3, 4, },
-    { 0, 2, 1, 5, 3, 4, }
+    { 0, 2, 1, 5, 3, 4, },
+    { 0, 2, 1, 6, 5, 3, 4, },
+    { 0, 2, 1, 7, 5, 6, 3, 4},
 };
 
-const int64_t ff_vorbis_channel_layouts[7] = {
+const int64_t ff_vorbis_channel_layouts[9] = {
     CH_LAYOUT_MONO,
     CH_LAYOUT_STEREO,
     CH_LAYOUT_SURROUND,
     CH_LAYOUT_QUAD,
     CH_LAYOUT_5POINT0_BACK,
     CH_LAYOUT_5POINT1_BACK,
+    CH_LAYOUT_5POINT1|CH_BACK_CENTER,
+    CH_LAYOUT_7POINT1,
     0
 };