diff options
| author | Ralph Giles <giles@thaumas.net> | 2017-06-13 10:23:06 -0700 |
|---|---|---|
| committer | Ralph Giles <giles@thaumas.net> | 2017-06-13 10:29:31 -0700 |
| commit | 34d821ceae87bd8baf8eedbd8037ef3dc05455a5 (patch) | |
| tree | 9b89b78d778aa0ba7b763730bcbb411d5ceb45f2 /silk | |
| parent | 41443428cbb9b551d96c687f70bae37ac3b32afb (diff) | |
| download | opus-34d821ceae87bd8baf8eedbd8037ef3dc05455a5.tar.gz | |
Fix a duplicate symbol name.
Both versions of silk/tables_NLSF_CB had symbols
named silk_NLSF_CB1_Wght_Q9 which causes problems
if both files are build as part of the same
compilation unit. Rename the wideband version
to include a 'WB' string to avoid the conflict.
Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
Diffstat (limited to 'silk')
| -rw-r--r-- | silk/tables_NLSF_CB_WB.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/silk/tables_NLSF_CB_WB.c b/silk/tables_NLSF_CB_WB.c index a15f7eb4..5cc9f57b 100644 --- a/silk/tables_NLSF_CB_WB.c +++ b/silk/tables_NLSF_CB_WB.c @@ -98,7 +98,7 @@ static const opus_uint8 silk_NLSF_CB1_WB_Q8[ 512 ] = { 110, 119, 129, 141, 175, 198, 218, 237 }; -static const opus_int16 silk_NLSF_CB1_Wght_Q9[ 512 ] = { +static const opus_int16 silk_NLSF_CB1_WB_Wght_Q9[ 512 ] = { 3657, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2925, 2963, 2963, 2925, 2846, 3216, 3085, 2972, 3056, 3056, 3010, 3010, 3010, 2963, 2963, 3010, 2972, 2888, 2846, 2846, 2726, 3920, 4014, 2981, 3207, 3207, 2934, 3056, 2846, 3122, 3244, 2925, 2846, 2620, 2553, 2780, 2925, @@ -223,7 +223,7 @@ const silk_NLSF_CB_struct silk_NLSF_CB_WB = SILK_FIX_CONST( 0.15, 16 ), SILK_FIX_CONST( 1.0 / 0.15, 6 ), silk_NLSF_CB1_WB_Q8, - silk_NLSF_CB1_Wght_Q9, + silk_NLSF_CB1_WB_Wght_Q9, silk_NLSF_CB1_iCDF_WB, silk_NLSF_PRED_WB_Q8, silk_NLSF_CB2_SELECT_WB, |