diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2019-05-15 09:14:50 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-15 09:14:50 -0700 |
| commit | 3883192c4b3c343c62d6ff033519c141360402a0 (patch) | |
| tree | 3cf21ce78a76afd0a86e1f8bc567cadd3112f722 | |
| parent | f22eea11a765e1fe8a5b1b8cafd994ce8f3f4d93 (diff) | |
| parent | 73441adf7fd51c5a0fb860ec3f288455e691dd19 (diff) | |
| download | fdk-aac-3883192c4b3c343c62d6ff033519c141360402a0.tar.gz fdk-aac-3883192c4b3c343c62d6ff033519c141360402a0.tar.bz2 fdk-aac-3883192c4b3c343c62d6ff033519c141360402a0.zip | |
Fix out of sync function declaration of scaleValues(). am: 1b5457fe93
am: 73441adf7f
Change-Id: I7a1b0a25be9f1049ef79732475e86b5444de7e2b
| -rw-r--r-- | libFDK/include/scale.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libFDK/include/scale.h b/libFDK/include/scale.h index 30fa089..655ccaf 100644 --- a/libFDK/include/scale.h +++ b/libFDK/include/scale.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 @@ -123,7 +123,7 @@ void scaleValues(FIXP_DBL *dst, const FIXP_DBL *src, INT len, INT scalefactor); #if (SAMPLE_BITS == 16) void scaleValues(FIXP_PCM *dst, const FIXP_DBL *src, INT len, INT scalefactor); #endif -void scaleValues(FIXP_PCM *dst, const FIXP_SGL *src, INT len, INT scalefactor); +void scaleValues(FIXP_SGL *dst, const FIXP_SGL *src, INT len, INT scalefactor); void scaleCplxValues(FIXP_DBL *r_dst, FIXP_DBL *i_dst, const FIXP_DBL *r_src, const FIXP_DBL *i_src, INT len, INT scalefactor); void scaleValuesWithFactor(FIXP_DBL *vector, FIXP_DBL factor, INT len, |