Mercurial > libavutil.hg
diff bswap.h @ 993:f8db9a2bae05 libavutil
Add av_ prefix to bswap macros
author | mru |
---|---|
date | Sat, 10 Jul 2010 22:12:30 +0000 |
parents | a13125b5be3a |
children | 41878f66798f |
line wrap: on
line diff
--- a/bswap.h Sat Jul 10 22:09:01 2010 +0000 +++ b/bswap.h Sat Jul 10 22:12:30 2010 +0000 @@ -48,16 +48,16 @@ #define AV_BSWAPC(s, x) AV_BSWAP##s##C(x) -#ifndef bswap_16 -static av_always_inline av_const uint16_t bswap_16(uint16_t x) +#ifndef av_bswap16 +static av_always_inline av_const uint16_t av_bswap16(uint16_t x) { x= (x>>8) | (x<<8); return x; } #endif -#ifndef bswap_32 -static av_always_inline av_const uint32_t bswap_32(uint32_t x) +#ifndef av_bswap32 +static av_always_inline av_const uint32_t av_bswap32(uint32_t x) { x= ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF); x= (x>>16) | (x<<16); @@ -65,8 +65,8 @@ } #endif -#ifndef bswap_64 -static inline uint64_t av_const bswap_64(uint64_t x) +#ifndef av_bswap64 +static inline uint64_t av_const av_bswap64(uint64_t x) { #if 0 x= ((x<< 8)&0xFF00FF00FF00FF00ULL) | ((x>> 8)&0x00FF00FF00FF00FFULL); @@ -78,8 +78,8 @@ uint32_t l[2]; } w, r; w.ll = x; - r.l[0] = bswap_32 (w.l[1]); - r.l[1] = bswap_32 (w.l[0]); + r.l[0] = av_bswap32 (w.l[1]); + r.l[1] = av_bswap32 (w.l[0]); return r.ll; #endif } @@ -89,21 +89,21 @@ // le2ne ... little-endian to native-endian #if HAVE_BIGENDIAN -#define be2ne_16(x) (x) -#define be2ne_32(x) (x) -#define be2ne_64(x) (x) -#define le2ne_16(x) bswap_16(x) -#define le2ne_32(x) bswap_32(x) -#define le2ne_64(x) bswap_64(x) +#define av_be2ne16(x) (x) +#define av_be2ne32(x) (x) +#define av_be2ne64(x) (x) +#define av_le2ne16(x) av_bswap16(x) +#define av_le2ne32(x) av_bswap32(x) +#define av_le2ne64(x) av_bswap64(x) #define AV_BE2NEC(s, x) (x) #define AV_LE2NEC(s, x) AV_BSWAPC(s, x) #else -#define be2ne_16(x) bswap_16(x) -#define be2ne_32(x) bswap_32(x) -#define be2ne_64(x) bswap_64(x) -#define le2ne_16(x) (x) -#define le2ne_32(x) (x) -#define le2ne_64(x) (x) +#define av_be2ne16(x) av_bswap16(x) +#define av_be2ne32(x) av_bswap32(x) +#define av_be2ne64(x) av_bswap64(x) +#define av_le2ne16(x) (x) +#define av_le2ne32(x) (x) +#define av_le2ne64(x) (x) #define AV_BE2NEC(s, x) AV_BSWAPC(s, x) #define AV_LE2NEC(s, x) (x) #endif