summaryrefslogtreecommitdiff
path: root/libavcodec/dca.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-29 13:29:07 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-29 13:31:44 +0200
commite8e733adccf7794017c2c1d98a1f2a052900542e (patch)
tree397ce9f77edc9a9ece6a149e75445145cfed62e5 /libavcodec/dca.c
parent4fd07b9366fb2f74b6af0dea8092d6bafa38f131 (diff)
downloadffmpeg-e8e733adccf7794017c2c1d98a1f2a052900542e.tar.gz
dca: favor native over ffmpeg in table name
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dca.c')
-rw-r--r--libavcodec/dca.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 517a5ac577..87112ed4ec 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -126,7 +126,7 @@ enum DCAXxchSpeakerMask {
DCA_XXCH_REAR_LOW_RIGHT = 0x8000000,
};
-static const uint32_t map_xxch_to_ffmpeg[28] = {
+static const uint32_t map_xxch_to_native[28] = {
AV_CH_FRONT_CENTER,
AV_CH_FRONT_LEFT,
AV_CH_FRONT_RIGHT,
@@ -2272,7 +2272,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
channel_layout = 0;
for (i = 0; i < s->xxch_nbits_spk_mask; ++i) {
if (channel_mask & (1 << i)) {
- channel_layout |= map_xxch_to_ffmpeg[i];
+ channel_layout |= map_xxch_to_native[i];
}
}
@@ -2293,7 +2293,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
: s->xxch_core_spkmask;
for (i = 0; i < s->xxch_nbits_spk_mask; i++) {
if (mask & ~(DCA_XXCH_LFE1 | DCA_XXCH_LFE2) & (1 << i)) {
- lavc = map_xxch_to_ffmpeg[i];
+ lavc = map_xxch_to_native[i];
posn = av_popcount(channel_layout & (lavc - 1));
s->xxch_order_tab[j++] = posn;
}