aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Walker <tdskywalker@gmail.com>2012-02-22 16:09:42 +0100
committerJustin Ruggles <justin.ruggles@gmail.com>2012-02-22 10:50:22 -0500
commit6bbaf6e0dd09430b7f8ba7f114eebc24925e1bce (patch)
tree26335139a4f6441e950a91002ec5521a5319bc72
parent147715ca10c1ea0b7a020933311d6a2615d684c9 (diff)
downloadffmpeg-6bbaf6e0dd09430b7f8ba7f114eebc24925e1bce.tar.gz
mlpdec_parser: fix a few channel layouts.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
-rw-r--r--libavcodec/mlp_parser.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c
index be71867c2d..3bf38c7f35 100644
--- a/libavcodec/mlp_parser.c
+++ b/libavcodec/mlp_parser.c
@@ -79,13 +79,13 @@ static const uint64_t thd_layout[13] = {
AV_CH_LOW_FREQUENCY, // LFE
AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRs
AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT, // LRvh
- AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRc
+ AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER, // LRc
AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT, // LRrs
AV_CH_BACK_CENTER, // Cs
AV_CH_TOP_BACK_CENTER, // Ts
AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, // LRsd
- AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER, // LRw
- AV_CH_TOP_BACK_CENTER, // Cvh
+ AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT, // LRw
+ AV_CH_TOP_FRONT_CENTER, // Cvh
AV_CH_LOW_FREQUENCY // LFE2
};
@@ -109,7 +109,8 @@ static int truehd_channels(int chanmap)
static uint64_t truehd_layout(int chanmap)
{
- int layout = 0, i;
+ int i;
+ uint64_t layout = 0;
for (i = 0; i < 13; i++)
layout |= thd_layout[i] * ((chanmap >> i) & 1);