diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-11-01 17:01:33 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-11-01 17:01:33 +0000 |
| commit | 419b878494346c2f9d81f23d7a75cbe03eb5dab0 (patch) | |
| tree | 2d410c6064c50c43ebb2b69444a7ddb2f730034a /libavutil | |
| parent | 6c02f9e7ee00d6a08c75a793546ea2e89b502a24 (diff) | |
| download | ffmpeg-419b878494346c2f9d81f23d7a75cbe03eb5dab0.tar.gz | |
Add ARCH_X86_32 as a new define for 32 bit x86 architectures and change
the semantics of ARCH_X86 to mean both 32 and 64 bits.
Originally committed as revision 6852 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/common.h | 2 | ||||
| -rw-r--r-- | libavutil/internal.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index 3ae59716e4..bb049e9628 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -344,7 +344,7 @@ static inline uint64_t read_time(void) ); return (d << 32) | (a & 0xffffffff); } -#elif defined(ARCH_X86) +#elif defined(ARCH_X86_32) static inline long long read_time(void) { long long l; diff --git a/libavutil/internal.h b/libavutil/internal.h index 285d30457f..4f7e525cfd 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -217,7 +217,7 @@ if((y)<(x)){\ static always_inline long int lrintf(float x) { #ifdef __MINGW32__ -# ifdef ARCH_X86 +# ifdef ARCH_X86_32 int32_t i; asm volatile( "fistpl %0\n\t" @@ -227,7 +227,7 @@ static always_inline long int lrintf(float x) # else /* XXX: incorrect, but make it compile */ return (int)(x + (x < 0 ? -0.5 : 0.5)); -# endif /* ARCH_X86 */ +# endif /* ARCH_X86_32 */ #else return (int)(rint(x)); #endif /* __MINGW32__ */ |