diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-07-08 20:11:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-12 02:33:16 +0200 |
| commit | 65219c3851825041456b06fd7d0b70b5f98c8e04 (patch) | |
| tree | a71586cbd54c56517c45fcf63726dc262643a61e /libavcodec | |
| parent | 9ca27df52fb4306a8e37c38d1ed9ab40c42a62dc (diff) | |
| download | ffmpeg-65219c3851825041456b06fd7d0b70b5f98c8e04.tar.gz | |
dca: map xxch side channels to AV_CH_SIDE_LEFT/RIGHT instead of REAR.
This fixes decoding of certain 7.1 DTS-HD HRA files, as well as matches the spec better.
Table 6-22 in the DTS spec labels the two channels "Left/Right surround on side", and not rear.
Reviewed-by: Benjamin Larsson <benjamin@southpole.se>
Reviewed-by: Nick Brereton <nick@nbrereton.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dca.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 87112ed4ec..41d4905307 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -136,8 +136,8 @@ static const uint32_t map_xxch_to_native[28] = { AV_CH_BACK_CENTER, AV_CH_BACK_LEFT, AV_CH_BACK_RIGHT, - AV_CH_BACK_LEFT, /* side surround left -- dup sur rear L */ - AV_CH_BACK_RIGHT, /* side surround right -- dup sur rear R */ + AV_CH_SIDE_LEFT, /* side surround left -- dup sur side L */ + AV_CH_SIDE_RIGHT, /* side surround right -- dup sur side R */ AV_CH_FRONT_LEFT_OF_CENTER, AV_CH_FRONT_RIGHT_OF_CENTER, AV_CH_TOP_FRONT_LEFT, |