summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-04-26 14:08:34 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-04-26 14:08:34 +0000
commit60dfa0b8d4a7b82498cbeee2eb6042b9f48d38d3 (patch)
tree309d04b62415874600721b4686a21c1031bc0de7 /libavcodec
parent9a53eb7ce725f704e3a2a1355fe93e0d614f3d44 (diff)
remove old draft last case not present anymore in iso specs
Originally committed as revision 12990 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpegaudiodec.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 7c4fce5654..f0ace1acc9 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -2479,9 +2479,9 @@ static int decode_frame_adu(AVCodecContext * avctx,
#include "mpeg4audio.h"
/* Next 3 arrays are indexed by channel config number (passed via codecdata) */
-static const uint8_t mp3Frames[16] = {0,1,1,2,3,3,4,5,2}; /* number of mp3 decoder instances */
+static const uint8_t mp3Frames[8] = {0,1,1,2,3,3,4,5}; /* number of mp3 decoder instances */
/* offsets into output buffer, assume output order is FL FR BL BR C LFE */
-static const uint8_t chan_offset[9][5] = {
+static const uint8_t chan_offset[8][5] = {
{0},
{0}, // C
{0}, // FLR
@@ -2490,7 +2490,6 @@ static const uint8_t chan_offset[9][5] = {
{4,0,2}, // C FLR BLRS
{4,0,2,5}, // C FLR BLRS LFE
{4,0,2,6,5}, // C FLR BLRS BLR LFE
- {0,2} // FLR BLRS
};