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/aac_ram.h | |
| 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/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) |