diff options
| author | Martin Storsjo <martin@martin.st> | 2011-05-18 12:28:33 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-02-24 23:07:49 +0200 |
| commit | 1ead790eadd0e09a118308caccc7ac37d36f43f3 (patch) | |
| tree | 0f7847184a1c166a4ce1dfe402e0b50d0386c8f6 /media/libstagefright/codecs/amrnb/common/src/gains_tbl.cpp | |
| parent | d95a8462c367a7bea1b4aee24917d3e9ed7e2a48 (diff) | |
| download | frameworks_av-1ead790eadd0e09a118308caccc7ac37d36f43f3.zip frameworks_av-1ead790eadd0e09a118308caccc7ac37d36f43f3.tar.gz frameworks_av-1ead790eadd0e09a118308caccc7ac37d36f43f3.tar.bz2 | |
stagefright amrnb: Remove extern from table definitions
Local prototype declarations are added where no suitable ones are
available in headers.
This fixes warnings when compiling as C - while the source
files are named .cpp, they actually are compileable as pure C.
This was committed on the master branch of the opencore
repository in commit a0acb494ea6682ca966b5ebbd3676c89c56d63a6,
based on AOSP contribution 10303.
Change-Id: Ib4e27ea30302c66e0233e63e5a4652f6339bc940
Diffstat (limited to 'media/libstagefright/codecs/amrnb/common/src/gains_tbl.cpp')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/common/src/gains_tbl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/amrnb/common/src/gains_tbl.cpp b/media/libstagefright/codecs/amrnb/common/src/gains_tbl.cpp index a08dd2d..a7cd6fb 100644 --- a/media/libstagefright/codecs/amrnb/common/src/gains_tbl.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/gains_tbl.cpp @@ -86,14 +86,16 @@ extern "C" ----------------------------------------------------------------------------*/ - extern const Word16 qua_gain_pitch[NB_QUA_PITCH] = + extern const Word16 qua_gain_pitch[]; + const Word16 qua_gain_pitch[NB_QUA_PITCH] = { 0, 3277, 6556, 8192, 9830, 11469, 12288, 13107, 13926, 14746, 15565, 16384, 17203, 18022, 18842, 19661 }; - extern const Word16 qua_gain_code[(NB_QUA_CODE+1)*3] = + extern const Word16 qua_gain_code[]; + const Word16 qua_gain_code[(NB_QUA_CODE+1)*3] = { /* gain factor (g_fac) and quantized energy error (qua_ener_MR122, qua_ener) * are stored: |