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/dec/src/dec_input_format_tab.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/dec/src/dec_input_format_tab.cpp')
| -rw-r--r-- | media/libstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp b/media/libstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp index 5e503e2..fffbbfd 100644 --- a/media/libstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp +++ b/media/libstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp @@ -153,7 +153,7 @@ extern "C" ----------------------------------------------------------------------------*/ /* Table containing the number of core AMR data bytes for */ /* each codec mode for WMF input format(number excludes frame type byte) */ - extern const Word16 WmfDecBytesPerFrame[16] = + const Word16 WmfDecBytesPerFrame[16] = { 12, /* 4.75 */ 13, /* 5.15 */ @@ -175,7 +175,7 @@ extern "C" /* Table containing the number of core AMR data bytes for */ /* each codec mode for IF2 input format. */ - extern const Word16 If2DecBytesPerFrame[16] = + const Word16 If2DecBytesPerFrame[16] = { 13, /* 4.75 */ 14, /* 5.15 */ |