diff options
| author | Måns Rullgård | 2010-07-10 22:12:30 +0000 |
|---|---|---|
| committer | Måns Rullgård | 2010-07-10 22:12:30 +0000 |
| commit | 8fc0162ac44f3e60798552ca6d19387be95cae4c (patch) | |
| tree | 443f7c684a3a8be0e9b70d67a91b8572bfa1ddd2 /libavutil/arm | |
| parent | e6b22522c94cfccda97018e52ab65da8c69d8a56 (diff) | |
Add av_ prefix to bswap macros
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/arm')
| -rw-r--r-- | libavutil/arm/bswap.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavutil/arm/bswap.h b/libavutil/arm/bswap.h index 9126350716..c5e74cc6d5 100644 --- a/libavutil/arm/bswap.h +++ b/libavutil/arm/bswap.h @@ -26,15 +26,15 @@ #ifdef __ARMCC_VERSION #if HAVE_ARMV6 -#define bswap_16 bswap_16 -static av_always_inline av_const unsigned bswap_16(unsigned x) +#define av_bswap16 av_bswap16 +static av_always_inline av_const unsigned av_bswap16(unsigned x) { __asm { rev16 x, x } return x; } -#define bswap_32 bswap_32 -static av_always_inline av_const uint32_t bswap_32(uint32_t x) +#define av_bswap32 av_bswap32 +static av_always_inline av_const uint32_t av_bswap32(uint32_t x) { return __rev(x); } @@ -43,16 +43,16 @@ static av_always_inline av_const uint32_t bswap_32(uint32_t x) #elif HAVE_INLINE_ASM #if HAVE_ARMV6 -#define bswap_16 bswap_16 -static av_always_inline av_const unsigned bswap_16(unsigned x) +#define av_bswap16 av_bswap16 +static av_always_inline av_const unsigned av_bswap16(unsigned x) { __asm__("rev16 %0, %0" : "+r"(x)); return x; } #endif -#define bswap_32 bswap_32 -static av_always_inline av_const uint32_t bswap_32(uint32_t x) +#define av_bswap32 av_bswap32 +static av_always_inline av_const uint32_t av_bswap32(uint32_t x) { #if HAVE_ARMV6 __asm__("rev %0, %0" : "+r"(x)); |