diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-27 11:16:22 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-02-27 11:16:23 -0800 |
| commit | fbaf72b701316c8050d73690ff387e62f724f216 (patch) | |
| tree | a9cb312c8b8cc87b87afb26f7bbcaf3ca60ee22b /media/libstagefright/codecs/amrnb/common/src/pow2_tbl.cpp | |
| parent | 7c7674ea2d7ba099b5afd3badf4d69da55b377dd (diff) | |
| parent | 1ead790eadd0e09a118308caccc7ac37d36f43f3 (diff) | |
| download | frameworks_av-fbaf72b701316c8050d73690ff387e62f724f216.zip frameworks_av-fbaf72b701316c8050d73690ff387e62f724f216.tar.gz frameworks_av-fbaf72b701316c8050d73690ff387e62f724f216.tar.bz2 | |
Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7
* changes:
stagefright amrnb: Remove extern from table definitions
stagefright amrnb: Add includes for prototype declarations of tables
stagefright amrnb: Add missing const qualifier to table declarations in headers
Diffstat (limited to 'media/libstagefright/codecs/amrnb/common/src/pow2_tbl.cpp')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/common/src/pow2_tbl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/amrnb/common/src/pow2_tbl.cpp b/media/libstagefright/codecs/amrnb/common/src/pow2_tbl.cpp index e0183a6..902ea0f 100644 --- a/media/libstagefright/codecs/amrnb/common/src/pow2_tbl.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/pow2_tbl.cpp @@ -53,6 +53,7 @@ terms listed above has been obtained from the copyright holder. ; INCLUDES ----------------------------------------------------------------------------*/ #include "typedef.h" +#include "pow2.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -81,7 +82,7 @@ extern "C" ; [Variable declaration - defined here and used outside this module] ----------------------------------------------------------------------------*/ - extern const Word16 pow2_tbl[33] = + const Word16 pow2_tbl[33] = { 16384, 16743, 17109, 17484, 17867, 18258, 18658, 19066, 19484, 19911, 20347, 20792, 21247, 21713, 22188, 22674, 23170, 23678, 24196, 24726, |