diff options
| author | Martin Storsjo <martin@martin.st> | 2020-11-17 12:38:51 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2020-11-17 12:38:51 +0200 |
| commit | c7a3808a2fd18bb4dad24d281cbb862b241806a9 (patch) | |
| tree | 2cea66fef9961cd71efc817fed7e857ef27099b0 /libSACdec/src/sac_dec_interface.h | |
| parent | d23a21ab427da642c8f32bb0659ae63a86f98e96 (diff) | |
| parent | f4adff7fbb0968a13fd5077ea3df734870aef3cf (diff) | |
| download | fdk-aac-c7a3808a2fd18bb4dad24d281cbb862b241806a9.tar.gz fdk-aac-c7a3808a2fd18bb4dad24d281cbb862b241806a9.tar.bz2 fdk-aac-c7a3808a2fd18bb4dad24d281cbb862b241806a9.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libSACdec/src/sac_dec_interface.h')
| -rw-r--r-- | libSACdec/src/sac_dec_interface.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libSACdec/src/sac_dec_interface.h b/libSACdec/src/sac_dec_interface.h index a2eea92..05a9a75 100644 --- a/libSACdec/src/sac_dec_interface.h +++ b/libSACdec/src/sac_dec_interface.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -249,10 +249,10 @@ typedef struct { } MEM_REQUIREMENTS; -#define PCM_MPS INT_PCM -#define PCM_MPSF FIXP_PCM +#define PCM_MPS LONG +#define PCM_MPSF FIXP_DBL -#define FIXP_DBL2PCM_MPS(x) ((INT_PCM)FX_DBL2FX_PCM(x)) +#define FIXP_DBL2PCM_MPS(x) ((LONG)(x)) /* exposed functions (library interface) */ |