Get one step closer to world domination.

[ffmpeg] / libavutil / bswap.h

diff --git a/libavutil/bswap.h b/libavutil/bswap.h
index 100ed1c262b11c4ad886be73989c49f84df1f290..52811e74a376f4eec7b94d03c7921b567f8e758f 100644 (file)
--- a/libavutil/bswap.h
+++ b/libavutil/bswap.h
@@ -19,7 +19,7 @@
  */
 
 /**
- * @file bswap.h
+ * @file libavutil/bswap.h
  * byte swapping routines
  */
 
@@ -30,13 +30,15 @@
 #include "config.h"
 #include "common.h"
 
-#if defined(ARCH_ARM)
+#if   ARCH_ARM
 #   include "arm/bswap.h"
-#elif defined(ARCH_BFIN)
+#elif ARCH_AVR32
+#   include "avr32/bswap.h"
+#elif ARCH_BFIN
 #   include "bfin/bswap.h"
-#elif defined(ARCH_SH4)
+#elif ARCH_SH4
 #   include "sh4/bswap.h"
-#elif defined(ARCH_X86)
+#elif ARCH_X86
 #   include "x86/bswap.h"
 #endif
 
@@ -77,10 +79,10 @@ static inline uint64_t av_const bswap_64(uint64_t x)
 }
 #endif
 
-// be2me ... BigEndian to MachineEndian
-// le2me ... LittleEndian to MachineEndian
+// be2me ... big-endian to machine-endian
+// le2me ... little-endian to machine-endian
 
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
 #define be2me_16(x) (x)
 #define be2me_32(x) (x)
 #define be2me_64(x) (x)