diff options
| author | Robert Swain <robert.swain@gmail.com> | 2010-01-29 13:51:25 +0000 |
|---|---|---|
| committer | Robert Swain <robert.swain@gmail.com> | 2010-01-29 13:51:25 +0000 |
| commit | 4a27f326c538ffcbb484aca67e4120b03091a85a (patch) | |
| tree | f9b8e23310fab32f06c2aa6ef0fda0da17ddfcee /libavcodec/vorbis_dec.c | |
| parent | 012dc2c426e02b688837d3d7477da55f4db032e6 (diff) | |
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
Diffstat (limited to 'libavcodec/vorbis_dec.c')
| -rw-r--r-- | libavcodec/vorbis_dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c index 93fafc1178..31d5092528 100644 --- a/libavcodec/vorbis_dec.c +++ b/libavcodec/vorbis_dec.c @@ -984,7 +984,7 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext) 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 @@ static int vorbis_decode_frame(AVCodecContext *avccontext, 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 { |