diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-09-02 20:40:36 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-09-02 20:40:36 +0000 |
| commit | 7c7c8dab7965e5fc3663e986ec7fe56836d20d90 (patch) | |
| tree | c08c09aee41e2e85aeb5759a7d475ba13852602d /libfaad2 | |
| parent | f5b576d2e5aa1d85db4d149e2d6f479d105c7179 (diff) | |
| download | mpv-7c7c8dab7965e5fc3663e986ec7fe56836d20d90.tar.bz2 mpv-7c7c8dab7965e5fc3663e986ec7fe56836d20d90.tar.xz | |
fixed win32 compile problems and broken bigendian support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10806 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libfaad2')
| -rw-r--r-- | libfaad2/bits.h | 4 | ||||
| -rw-r--r-- | libfaad2/common.h | 5 | ||||
| -rw-r--r-- | libfaad2/config.h | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/libfaad2/bits.h b/libfaad2/bits.h index fbe2295215..809084aa84 100644 --- a/libfaad2/bits.h +++ b/libfaad2/bits.h @@ -56,9 +56,9 @@ typedef struct _bitfile } bitfile; -#if defined (_WIN32) && !defined(_WIN32_WCE) +#if defined (_WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) #define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax -#elif defined(LINUX) || defined(DJGPP) +#elif defined(ARCH_X86) && (defined(DJGPP) || defined(__GNUC__)) #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ) #else #define BSWAP(a) \ diff --git a/libfaad2/common.h b/libfaad2/common.h index 4660e9589b..c622913ae0 100644 --- a/libfaad2/common.h +++ b/libfaad2/common.h @@ -109,7 +109,7 @@ extern "C" { #if defined(_WIN32) - +#if 0 typedef unsigned __int64 uint64_t; typedef unsigned __int32 uint32_t; typedef unsigned __int16 uint16_t; @@ -118,6 +118,9 @@ typedef __int64 int64_t; typedef __int32 int32_t; typedef __int16 int16_t; typedef __int8 int8_t; +#else +#include <inttypes.h> +#endif typedef float float32_t; diff --git a/libfaad2/config.h b/libfaad2/config.h index 5c90a4b6f3..65a76d9dbe 100644 --- a/libfaad2/config.h +++ b/libfaad2/config.h @@ -1,3 +1,9 @@ +#include "../config.h" + +#ifdef WORDS_BIGENDIAN +#define ARCH_IS_BIG_ENDIAN 1 +#endif + /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ |