diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 14:51:05 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 14:51:05 -0800 |
| commit | b2511c6a79ea8d029b2b9d19130fd41d9838546f (patch) | |
| tree | 19735375d488a64d7005b3b8e9ecec5438168913 /libFDK/include/common_fix.h | |
| parent | 49fa8770b0adce84246d5db3feec09db02eeeaee (diff) | |
| parent | 6ab36997af5d5acda4f21d33031f4e45c85f96b7 (diff) | |
| download | android_external_aac-cm-10.1.tar.gz android_external_aac-cm-10.1.tar.bz2 android_external_aac-cm-10.1.zip | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/aac into mr1-stagingcm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1
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) |