diff options
| author | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-18 19:39:34 +0000 |
|---|---|---|
| committer | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-18 19:39:34 +0000 |
| commit | 82361d50d0dcbb72132fe1203fe152a89dd165e9 (patch) | |
| tree | 4abb0b4820172c1167ddb75433038be03aa44063 /libfaad2/common.h | |
| parent | b664e7f3216a22b9e3f92e4861733a3222fa11d8 (diff) | |
| download | mpv-82361d50d0dcbb72132fe1203fe152a89dd165e9.tar.bz2 mpv-82361d50d0dcbb72132fe1203fe152a89dd165e9.tar.xz | |
Update to faad2 cvs 20040915+MPlayer fixes
Patch by me and Emanuele Giaquinta
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18142 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2/common.h')
| -rw-r--r-- | libfaad2/common.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/libfaad2/common.h b/libfaad2/common.h index 859baf2155..d4f4b3a73d 100644 --- a/libfaad2/common.h +++ b/libfaad2/common.h @@ -134,12 +134,6 @@ extern "C" { # endif #endif -#if ((defined(_WIN32) && !defined(_WIN32_WCE)) /* || ((__GNUC__ >= 3) && defined(__i386__)) */ ) -#ifndef FIXED_POINT -/* includes <xmmintrin.h> to enable SSE intrinsics */ -//#define USE_SSE -#endif -#endif #ifdef FIXED_POINT #define DIV_R(A, B) (((int64_t)A << REAL_BITS)/B) @@ -307,10 +301,6 @@ char *strchr(), *strrchr(); typedef float real_t; -#ifdef USE_SSE -# include <xmmintrin.h> -#endif - #define MUL_R(A,B) ((A)*(B)) #define MUL_C(A,B) ((A)*(B)) #define MUL_F(A,B) ((A)*(B)) @@ -341,7 +331,7 @@ char *strchr(), *strrchr(); } return i; } - #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__) && !defined(HAVE_LRINTF) + #elif (defined(__i386__) && defined(__GNUC__)) && !defined(HAVE_LRINTF) #define HAS_LRINTF // from http://www.stereopsis.com/FPU.html static INLINE int lrintf(float f) @@ -426,6 +416,7 @@ uint32_t wl_min_lzc(uint32_t x); #ifdef FIXED_POINT #define LOG2_MIN_INF REAL_CONST(-10000) int32_t log2_int(uint32_t val); +int32_t log2_fix(uint32_t val); int32_t pow2_int(real_t val); real_t pow2_fix(real_t val); #endif |