diff options
author | Martin Storsjo <martin@martin.st> | 2016-10-18 03:18:40 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-18 03:18:40 +0000 |
commit | 8124c22bb7be48fdc496b2148c1315b911f309e8 (patch) | |
tree | 0a1be934e56560c4585d2606ec53336a6a3793f4 /libSBRdec/src | |
parent | ca6ae4ffe4c5b38b4a3619dec4a51c60257e77ef (diff) | |
parent | 515fb25ef76da9b8a1ad842aaccd3ebb6790c5dc (diff) | |
download | fdk-aac-8124c22bb7be48fdc496b2148c1315b911f309e8.tar.gz fdk-aac-8124c22bb7be48fdc496b2148c1315b911f309e8.tar.bz2 fdk-aac-8124c22bb7be48fdc496b2148c1315b911f309e8.zip |
Merge "Add casts to avoid errors due to narrowing" am: 4556cb9cb8
am: 515fb25ef7
Change-Id: Ic97d0e64efee960f87b2cb7581666b2af05873cd
Diffstat (limited to 'libSBRdec/src')
-rw-r--r-- | libSBRdec/src/sbr_rom.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libSBRdec/src/sbr_rom.cpp b/libSBRdec/src/sbr_rom.cpp index c48ce35..4f2cc48 100644 --- a/libSBRdec/src/sbr_rom.cpp +++ b/libSBRdec/src/sbr_rom.cpp @@ -1185,7 +1185,7 @@ const FIXP_DBL Alphas[NO_ICC_LEVELS] = { #define FL2FXCONST_PS FL2FXCONST_SGL #else #define FIXP_PS FIXP_DBL -#define FXP_CAST +#define FXP_CAST(x) ((FIXP_DBL)(x)) #define FL2FXCONST_PS FL2FXCONST_DBL #endif |