diff options
| author | Martin Storsjo <martin@martin.st> | 2022-01-10 13:44:04 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2022-01-10 13:55:34 +0200 |
| commit | 41ae84525e66febd33ea1fa0130a5b46610f4173 (patch) | |
| tree | 2e7f66da35feda4d6136c3a9e970ebee254d0c2d /libAACdec/src/usacdec_acelp.cpp | |
| parent | 573e93e4d0d08127dd3b2297a0ce52221527d90a (diff) | |
| parent | dd6d9f9f6c9d095bd159d4f0d8b36a6b7e6057a8 (diff) | |
| download | fdk-aac-41ae84525e66febd33ea1fa0130a5b46610f4173.tar.gz fdk-aac-41ae84525e66febd33ea1fa0130a5b46610f4173.tar.bz2 fdk-aac-41ae84525e66febd33ea1fa0130a5b46610f4173.zip | |
Merge remote-tracking branch 'aosp/master'
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 fbe3188..9769a07 100644 --- a/libAACdec/src/usacdec_acelp.cpp +++ b/libAACdec/src/usacdec_acelp.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -719,7 +719,7 @@ static void ConcealPitchLag(CAcelpStaticMem *acelp_mem, const int PIT_MAX, UCHAR *pold_T0_frac = &acelp_mem->old_T0_frac; if ((int)*pold_T0 >= PIT_MAX) { - *pold_T0 = (UCHAR)(PIT_MAX - 5); + *pold_T0 = (USHORT)(PIT_MAX - 5); } *pT0 = (int)*pold_T0; *pT0_frac = (int)*pold_T0_frac; |