diff options
| author | Martin Storsjo <martin@martin.st> | 2012-11-01 11:08:03 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-11-01 11:08:03 +0200 |
| commit | 54dfe1ec6972ca0d56dcb671448f84fea5e37e35 (patch) | |
| tree | 5d26aa077f3aa32d3e5113546abc5a4219332640 /libFDK/include/common_fix.h | |
| parent | fea3c1d0ffaf5975bb15462e11edf9c7a664890d (diff) | |
| parent | 6ab36997af5d5acda4f21d33031f4e45c85f96b7 (diff) | |
| download | fdk-aac-54dfe1ec6972ca0d56dcb671448f84fea5e37e35.tar.gz fdk-aac-54dfe1ec6972ca0d56dcb671448f84fea5e37e35.tar.bz2 fdk-aac-54dfe1ec6972ca0d56dcb671448f84fea5e37e35.zip | |
Merge remote-tracking branch 'aosp/jb-mr1-release' into master
Conflicts:
libAACenc/src/band_nrg.cpp
libAACenc/src/grp_data.cpp
libSBRenc/src/env_est.cpp
Diffstat (limited to 'libFDK/include/common_fix.h')
| -rw-r--r-- | libFDK/include/common_fix.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libFDK/include/common_fix.h b/libFDK/include/common_fix.h index 83d4ba3..a39548e 100644 --- a/libFDK/include/common_fix.h +++ b/libFDK/include/common_fix.h @@ -225,7 +225,6 @@ FDK_INLINE FIXP_DBL fAbs(FIXP_DBL x) FDK_INLINE FIXP_SGL fAbs(FIXP_SGL x) { return fixabs_S(x); } - /* workaround for TI C6x compiler but not for TI ARM9E compiler */ #if (!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__x86_64__) FDK_INLINE INT fAbs(INT x) @@ -336,7 +335,6 @@ FDK_INLINE FIXP_SGL fMin(FIXP_SGL a, FIXP_SGL b) FDK_INLINE FIXP_SGL fMax(FIXP_SGL a, FIXP_SGL b) { return fixmax_S(a,b); } - /* workaround for TI C6x compiler but not for TI ARM9E */ #if ((!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__x86_64__)) || (FIX_FRACT == 1) FDK_INLINE INT fMax(INT a, INT b) |