diff options
author | Xin Li <delphij@google.com> | 2021-10-07 23:50:23 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-07 23:50:23 +0000 |
commit | 0bfa3fc1cd1c7ef3e563aa5506ee16cfb1ed4494 (patch) | |
tree | c6a1ddee22e29d9ea00ec2523071a711368189cd /libAACdec/src/aac_ram.h | |
parent | 6d10f91a77002b6371ebada491f507ef974ca572 (diff) | |
parent | 1b5221d9fee482e03342eb1593f580754fa7ab3f (diff) | |
download | fdk-aac-0bfa3fc1cd1c7ef3e563aa5506ee16cfb1ed4494.tar.gz fdk-aac-0bfa3fc1cd1c7ef3e563aa5506ee16cfb1ed4494.tar.bz2 fdk-aac-0bfa3fc1cd1c7ef3e563aa5506ee16cfb1ed4494.zip |
Merge "Merge Android 12"
Diffstat (limited to 'libAACdec/src/aac_ram.h')
-rw-r--r-- | libAACdec/src/aac_ram.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libAACdec/src/aac_ram.h b/libAACdec/src/aac_ram.h index b9b95b7..395b2b2 100644 --- a/libAACdec/src/aac_ram.h +++ b/libAACdec/src/aac_ram.h @@ -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 @@ -132,7 +132,7 @@ H_ALLOC_MEM(CplxPredictionData, CCplxPredictionData) H_ALLOC_MEM(SpectralCoeffs, FIXP_DBL) H_ALLOC_MEM(SpecScale, SHORT) -H_ALLOC_MEM(TimeDataFlush, INT_PCM) +H_ALLOC_MEM(TimeDataFlush, PCM_DEC) H_ALLOC_MEM_OVERLAY(WorkBufferCore1, CWorkBufferCore1) H_ALLOC_MEM_OVERLAY(WorkBufferCore2, FIXP_DBL) |