Mercurial > libavcodec.hg
changeset 426:a69ba632a048 libavcodec
better logic for bswap
| author | glantau |
|---|---|
| date | Sat, 25 May 2002 22:38:02 +0000 |
| parents | d69e752cf8d1 |
| children | c058624083e1 |
| files | common.h |
| diffstat | 1 files changed, 14 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/common.h Sat May 25 22:36:24 2002 +0000 +++ b/common.h Sat May 25 22:38:02 2002 +0000 @@ -50,6 +50,8 @@ typedef INT16 int16_t; typedef UINT32 uint32_t; typedef INT32 int32_t; +typedef UINT64 uint64_t; +typedef INT64 int64_t; #ifndef __MINGW32__ #define INT64_C(c) (c ## i64) @@ -69,22 +71,15 @@ #define DEBUG #endif -// code from bits/byteswap.h (C) 1997, 1998 Free Software Foundation, Inc. -#define bswap_32(x) \ - ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) -#define be2me_32(x) bswap_32(x) - #define snprintf _snprintf -#ifndef __MINGW32__ -/* no config.h with VC */ -#define CONFIG_ENCODERS 1 -#define CONFIG_DECODERS 1 -#define CONFIG_AC3 1 -#endif +#ifdef HAVE_AV_CONFIG_H + +#define MANGLE(a) "_" #a -#else +#endif /* HAVE_AV_CONFIG_H */ + +#else /* CONFIG_WIN32 */ /* unix */ @@ -114,19 +109,22 @@ #define UINT64_C(c) (c ## ULL) #endif -#include "bswap.h" - #ifdef USE_FASTMEMCPY #include "fastmemcpy.h" #endif +#define MANGLE(a) #a + #endif /* HAVE_AV_CONFIG_H */ #endif /* !CONFIG_WIN32 */ +#ifdef HAVE_AV_CONFIG_H + +#include "bswap.h" + /* debug stuff */ -#ifdef HAVE_AV_CONFIG_H #ifndef DEBUG #define NDEBUG