commit 2ba0804164f6f288c8a863fc795c0fea08ef18a9
author Jean-Baptiste Queru <jbq@google.com> Mon Feb 27 13:14:53 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 27 13:14:53 2012 -0800
tree 3ac0b7f31d690129f2550a3f2e33c86a5f4e694a
parent cfef1d0ac0dfd425091e4684138174d42ef4f151
parent 484fc74beb79d0b8d49223cb3fce9e1ccbfd3501

am 484fc74b: am 4bcdeb86: am 716a0517: am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"

* commit '484fc74beb79d0b8d49223cb3fce9e1ccbfd3501':
  stagefright amrwb: Make a global const array static

media/libstagefright/codecs/amrwb/include/pvamrwbdecoder_api.h

diff --git a/media/libstagefright/codecs/amrwb/include/pvamrwbdecoder_api.h b/media/libstagefright/codecs/amrwb/include/pvamrwbdecoder_api.h
index 457c21f..eca5ae0 100644
--- a/media/libstagefright/codecs/amrwb/include/pvamrwbdecoder_api.h
+++ b/media/libstagefright/codecs/amrwb/include/pvamrwbdecoder_api.h
@@ -106,7 +106,7 @@
 #define NUM_OF_MODES  10
 
 
-    const int16 AMR_WB_COMPRESSED[NUM_OF_MODES] =
+    static const int16 AMR_WB_COMPRESSED[NUM_OF_MODES] =
     {
         NBBITS_7k,
         NBBITS_9k,