Mercurial > libavcodec.hg

diff vorbis_dec.c @ 11051:5d4991dd23de libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author superdump
date Fri, 29 Jan 2010 13:51:25 +0000
parents fe81255af588
children 4b3da727d832
line wrap: on
line diff
--- a/vorbis_dec.c	Thu Jan 28 23:49:46 2010 +0000
+++ b/vorbis_dec.c	Fri Jan 29 13:51:25 2010 +0000
@@ -984,7 +984,7 @@
         return -1;
     }
 
-    if (vc->audio_channels > 6)
+    if (vc->audio_channels > 8)
         avccontext->channel_layout = 0;
     else
         avccontext->channel_layout = ff_vorbis_channel_layouts[vc->audio_channels - 1];
@@ -1616,7 +1616,7 @@
 
     AV_DEBUG("parsed %d bytes %d bits, returned %d samples (*ch*bits) \n", get_bits_count(gb)/8, get_bits_count(gb)%8, len);
 
-    if (vc->audio_channels > 6) {
+    if (vc->audio_channels > 8) {
         for (i = 0; i < vc->audio_channels; i++)
             channel_ptrs[i] = vc->channel_floors + i * len;
     } else {