aboutsummaryrefslogtreecommitdiffstats
path: root/libFDK/src/FDK_tools_rom.cpp
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2016-10-18 08:28:51 +0300
committerMartin Storsjo <martin@martin.st>2016-10-18 08:28:51 +0300
commit55554d0b2d5e47f7ddaea9188badef37aafc9be8 (patch)
tree9a1a1ad4a1bd901288724e6e1109ec72b321664b /libFDK/src/FDK_tools_rom.cpp
parentcb57d89522806f8161fdbc05d1039e1a3ff5ef76 (diff)
parent4556cb9cb8b12574c41b749b20c1c149fed54a37 (diff)
downloadfdk-aac-55554d0b2d5e47f7ddaea9188badef37aafc9be8.tar.gz
fdk-aac-55554d0b2d5e47f7ddaea9188badef37aafc9be8.tar.bz2
fdk-aac-55554d0b2d5e47f7ddaea9188badef37aafc9be8.zip
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libFDK/src/FDK_tools_rom.cpp')
-rw-r--r--libFDK/src/FDK_tools_rom.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libFDK/src/FDK_tools_rom.cpp b/libFDK/src/FDK_tools_rom.cpp
index 29e37f2..f9121d1 100644
--- a/libFDK/src/FDK_tools_rom.cpp
+++ b/libFDK/src/FDK_tools_rom.cpp
@@ -1260,9 +1260,9 @@ const FIXP_WTP * FDKgetWindowSlope(int length, int shape)
#define QTCFL(x) FL2FXCONST_SGL(x)
#define QTC(x) FX_DBL2FXCONST_SGL(x)
#else
-#define QFC(x) (x)
+#define QFC(x) ((FIXP_DBL)(x))
#define QTCFL(x) FL2FXCONST_DBL(x)
-#define QTC(x) (x)
+#define QTC(x) ((FIXP_DBL)(x))
#endif /* ARCH_PREFER_MULT_32x16 */
#ifndef LOW_POWER_SBR_ONLY