diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-26 17:10:27 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-26 17:10:27 -0800 |
| commit | 2ddc635e1dab78b16da93c4e05d46c3d5a260ee7 (patch) | |
| tree | 4f89eeadc3ac325afcd870697a7bf2d4e0d0952f /libAACdec/src/usacdec_fac.cpp | |
| parent | 1308fe1b8b7491fb6bced3642acf2d34552cdd47 (diff) | |
| parent | f69ca4c61480acd4248aa4975ef205e1a96eaa3f (diff) | |
| download | fdk-aac-2ddc635e1dab78b16da93c4e05d46c3d5a260ee7.tar.gz fdk-aac-2ddc635e1dab78b16da93c4e05d46c3d5a260ee7.tar.bz2 fdk-aac-2ddc635e1dab78b16da93c4e05d46c3d5a260ee7.zip | |
Merge "Signed Integer Overflow in E_UTIL_preemph()" am: aea2558c50 am: b471c2c215
am: f69ca4c614
Change-Id: I78ee4dccc649e0ff2ee4006212795d89c2f8233c
Diffstat (limited to 'libAACdec/src/usacdec_fac.cpp')
| -rw-r--r-- | libAACdec/src/usacdec_fac.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libAACdec/src/usacdec_fac.cpp b/libAACdec/src/usacdec_fac.cpp index 71ce4a9..6b595d4 100644 --- a/libAACdec/src/usacdec_fac.cpp +++ b/libAACdec/src/usacdec_fac.cpp @@ -142,7 +142,7 @@ FIXP_DBL *CLpd_FAC_GetMemory(CAacDecoderChannelInfo *pAacDecoderChannelInfo, return ptr; } -int CLpd_FAC_Read(HANDLE_FDK_BITSTREAM hBs, FIXP_DBL *pFac, UCHAR *pFacScale, +int CLpd_FAC_Read(HANDLE_FDK_BITSTREAM hBs, FIXP_DBL *pFac, SCHAR *pFacScale, int length, int use_gain, int frame) { FIXP_DBL fac_gain; int fac_gain_e = 0; |