diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-27 13:14:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-27 13:14:53 -0800 |
| commit | 54fd89aec2b34f6ea14d7b93b34a4a7a69ab0278 (patch) | |
| tree | a735e459adb68332c55d6e97d1638243ca0320c6 /media | |
| parent | f2f4a649d71aea5066d609c10cd9449df9abd453 (diff) | |
| parent | 30e927947126e87f4865b626ffe17bec74ff5ffe (diff) | |
| download | frameworks_av-54fd89aec2b34f6ea14d7b93b34a4a7a69ab0278.zip frameworks_av-54fd89aec2b34f6ea14d7b93b34a4a7a69ab0278.tar.gz frameworks_av-54fd89aec2b34f6ea14d7b93b34a4a7a69ab0278.tar.bz2 | |
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
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/amrwb/include/pvamrwbdecoder_api.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ extern "C" #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, |