diff options
| author | Martin Storsjo <martin@martin.st> | 2018-08-31 14:07:00 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2018-09-02 23:18:06 +0300 |
| commit | 59995402a5260fbc9bd451af6d6c03bf1ccc73ee (patch) | |
| tree | 1eb75ee4b007b23cb586741775ce1193943f101c /libAACdec/src/usacdec_acelp.cpp | |
| parent | 44f8845eb6135f27573558c63b176bb5820684df (diff) | |
| download | fdk-aac-59995402a5260fbc9bd451af6d6c03bf1ccc73ee.tar.gz fdk-aac-59995402a5260fbc9bd451af6d6c03bf1ccc73ee.tar.bz2 fdk-aac-59995402a5260fbc9bd451af6d6c03bf1ccc73ee.zip | |
Add an fdk_ prefix to t_qua_gain7b
This fixes symbol collisions, if libfdk-aac and libopencore-amr are
statically linked into the same binary.
Diffstat (limited to 'libAACdec/src/usacdec_acelp.cpp')
| -rw-r--r-- | libAACdec/src/usacdec_acelp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libAACdec/src/usacdec_acelp.cpp b/libAACdec/src/usacdec_acelp.cpp index af1f488..ed775d2 100644 --- a/libAACdec/src/usacdec_acelp.cpp +++ b/libAACdec/src/usacdec_acelp.cpp @@ -267,9 +267,9 @@ static void D_gain2_plus(int index, FIXP_COD code[], FIXP_SGL *gain_pit, gcode0_e = gcode0_e + SF_MEAN_ENER_LG10 - (ener_code_e >> 1) + 1; i = index << 1; - *gain_pit = t_qua_gain7b[i]; /* adaptive codebook gain */ + *gain_pit = fdk_t_qua_gain7b[i]; /* adaptive codebook gain */ /* t_qua_gain[ind2p1] : fixed codebook gain correction factor */ - Ltmp = fMult(t_qua_gain7b[i + 1], gcode0); + Ltmp = fMult(fdk_t_qua_gain7b[i + 1], gcode0); *gain_code = scaleValue(Ltmp, gcode0_e - SF_GAIN_C + SF_QUA_GAIN7B); /* update bad frame handler */ |