From 314af0ff94255ab5f08790c05b9967c5f960a6e8 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Tue, 31 Jan 2012 14:25:35 -0800 Subject: aacdec: Use correct speaker order for 7.1. The spec says the following speaker mapping is default: center front speaker left, right center front speakers, left, right outside front speakers, left surround, right surround rear speakers, front low frequency effects speaker --- libavcodec/aacdectab.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h index 4f8d84b241..70372adf97 100644 --- a/libavcodec/aacdectab.h +++ b/libavcodec/aacdectab.h @@ -87,7 +87,7 @@ static const uint8_t aac_channel_layout_map[7][5][2] = { { { TYPE_CPE, 0 }, { TYPE_SCE, 0 }, { TYPE_SCE, 1 }, }, { { TYPE_CPE, 0 }, { TYPE_SCE, 0 }, { TYPE_CPE, 1 }, }, { { TYPE_CPE, 0 }, { TYPE_SCE, 0 }, { TYPE_LFE, 0 }, { TYPE_CPE, 1 }, }, - { { TYPE_CPE, 0 }, { TYPE_SCE, 0 }, { TYPE_LFE, 0 }, { TYPE_CPE, 2 }, { TYPE_CPE, 1 }, }, + { { TYPE_CPE, 1 }, { TYPE_SCE, 0 }, { TYPE_LFE, 0 }, { TYPE_CPE, 2 }, { TYPE_CPE, 0 }, }, }; static const uint64_t aac_channel_layout[8] = { @@ -97,7 +97,7 @@ static const uint64_t aac_channel_layout[8] = { AV_CH_LAYOUT_4POINT0, AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_5POINT1_BACK, - AV_CH_LAYOUT_7POINT1_WIDE, + AV_CH_LAYOUT_7POINT1_WIDE_BACK, 0, }; -- cgit v1.2.3