summaryrefslogtreecommitdiff
path: root/libavutil/avr32
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-07-10 22:12:30 +0000
committerMåns Rullgård <mans@mansr.com>2010-07-10 22:12:30 +0000
commit8fc0162ac44f3e60798552ca6d19387be95cae4c (patch)
tree443f7c684a3a8be0e9b70d67a91b8572bfa1ddd2 /libavutil/avr32
parente6b22522c94cfccda97018e52ab65da8c69d8a56 (diff)
downloadffmpeg-8fc0162ac44f3e60798552ca6d19387be95cae4c.tar.gz
Add av_ prefix to bswap macros
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/avr32')
-rw-r--r--libavutil/avr32/bswap.h8
-rw-r--r--libavutil/avr32/intreadwrite.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/libavutil/avr32/bswap.h b/libavutil/avr32/bswap.h
index e8c8ddc4ef..e79d53f369 100644
--- a/libavutil/avr32/bswap.h
+++ b/libavutil/avr32/bswap.h
@@ -25,15 +25,15 @@
#if HAVE_INLINE_ASM
-#define bswap_16 bswap_16
-static av_always_inline av_const uint16_t bswap_16(uint16_t x)
+#define av_bswap16 av_bswap16
+static av_always_inline av_const uint16_t av_bswap16(uint16_t x)
{
__asm__ ("swap.bh %0" : "+r"(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)
{
__asm__ ("swap.b %0" : "+r"(x));
return x;
diff --git a/libavutil/avr32/intreadwrite.h b/libavutil/avr32/intreadwrite.h
index 3e468b4e88..c6fd3aa470 100644
--- a/libavutil/avr32/intreadwrite.h
+++ b/libavutil/avr32/intreadwrite.h
@@ -106,8 +106,8 @@ static av_always_inline void AV_WB32(void *p, uint32_t v)
}
/* These two would be defined by generic code, but we need them sooner. */
-#define AV_RL32(p) bswap_32(AV_RB32(p))
-#define AV_WL32(p, v) AV_WB32(p, bswap_32(v))
+#define AV_RL32(p) av_bswap32(AV_RB32(p))
+#define AV_WL32(p, v) AV_WB32(p, av_bswap32(v))
#define AV_WB64 AV_WB64
static av_always_inline void AV_WB64(void *p, uint64_t v)