From 034816f92436de28071652d88975a5fcef317acd Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Wed, 18 May 2011 12:25:42 +0300 Subject: stagefright amrwb: Make a global const array static This fixes compilation as C - while the source files are named .cpp, they actually are compileable as pure C. Prior to this, this table produced multiple definitions of the same symbol. This was committed on the master branch of the opencore repository in commit a803bd49a631317e0d52ff060cf1799f7741a47e, based on AOSP contribution 10017. Change-Id: Id76274964242b119ab61b8181e557477df1e1521 --- media/libstagefright/codecs/amrwb/include/pvamrwbdecoder_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'media') 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, -- cgit v1.1