From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 29 Jun 2012 09:31:37 +0000 (+0200)
Subject: dca: fix project reference in table name
X-Git-Tag: android-x86-4.4-r1~10970
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=84d73e9d5d9e7e05077bcbaf8b801645f9a568c1;p=android-x86%2Fexternal-ffmpeg.git

dca: fix project reference in table name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 6d025244c5..517a5ac577 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_libav[28] = {
+static const uint32_t map_xxch_to_ffmpeg[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_libav[i];
+                channel_layout |= map_xxch_to_ffmpeg[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_libav[i];
+                        lavc = map_xxch_to_ffmpeg[i];
                         posn = av_popcount(channel_layout & (lavc - 1));
                         s->xxch_order_tab[j++] = posn;
                     }