diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-09-25 12:46:54 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-21 12:29:51 -0400 |
| commit | fff0f831e0c8ccf87a6374f4bb349ac668bce14e (patch) | |
| tree | 02af632e973068d479669c9ba466ca5ac0b59da1 | |
| parent | f507dd067aec52b251f25e265cdb8b333db33b42 (diff) | |
| download | ffmpeg-fff0f831e0c8ccf87a6374f4bb349ac668bce14e.tar.gz | |
mp3on4: fix the output channel order
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 3bd7b02b9c..57dadedca1 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -1901,16 +1901,16 @@ typedef struct MP3On4DecodeContext { /* Next 3 arrays are indexed by channel config number (passed via codecdata) */ 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 */ +/* offsets into output buffer, assume output order is FL FR C LFE BL BR SL SR */ static const uint8_t chan_offset[8][5] = { {0}, {0}, // C {0}, // FLR {2,0}, // C FLR {2,0,3}, // C FLR BS - {4,0,2}, // C FLR BLRS - {4,0,2,5}, // C FLR BLRS LFE - {4,0,2,6,5}, // C FLR BLRS BLR LFE + {2,0,3}, // C FLR BLRS + {2,0,4,3}, // C FLR BLRS LFE + {2,0,6,4,3}, // C FLR BLRS BLR LFE }; |