summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-02-27 13:07:20 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-27 13:07:20 -0800
commit30e927947126e87f4865b626ffe17bec74ff5ffe (patch)
tree2d1a31f5db634feee556cce6fb8bbf291f29aba5 /media/libstagefright
parent59e82a04949ffca325508f5ebf43fdb8657e350c (diff)
parenta4999a9f0fb1a5690d967c08c7c6216221bc028a (diff)
downloadframeworks_av-30e927947126e87f4865b626ffe17bec74ff5ffe.zip
frameworks_av-30e927947126e87f4865b626ffe17bec74ff5ffe.tar.gz
frameworks_av-30e927947126e87f4865b626ffe17bec74ff5ffe.tar.bz2
am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"
* commit 'fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f': stagefright amrwb: Make a global const array static
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/codecs/amrwb/include/pvamrwbdecoder_api.h2
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,