diff options
Diffstat (limited to 'libaf')
| -rw-r--r-- | libaf/af_format.c | 5 | ||||
| -rw-r--r-- | libaf/af_format.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libaf/af_format.c b/libaf/af_format.c index 729b964726..5cee93442c 100644 --- a/libaf/af_format.c +++ b/libaf/af_format.c @@ -26,6 +26,7 @@ #include <inttypes.h> #include <limits.h> #include <math.h> +#include <endian.h> #include "config.h" #include "af.h" @@ -334,7 +335,7 @@ af_info_t af_info_format = { }; static inline uint32_t load24bit(void* data, int pos) { -#if HAVE_BIGENDIAN +#if BYTE_ORDER == BIG_ENDIAN return (((uint32_t)((uint8_t*)data)[3*pos])<<24) | (((uint32_t)((uint8_t*)data)[3*pos+1])<<16) | (((uint32_t)((uint8_t*)data)[3*pos+2])<<8); @@ -346,7 +347,7 @@ static inline uint32_t load24bit(void* data, int pos) { } static inline void store24bit(void* data, int pos, uint32_t expanded_value) { -#if HAVE_BIGENDIAN +#if BYTE_ORDER == BIG_ENDIAN ((uint8_t*)data)[3*pos]=expanded_value>>24; ((uint8_t*)data)[3*pos+1]=expanded_value>>16; ((uint8_t*)data)[3*pos+2]=expanded_value>>8; diff --git a/libaf/af_format.h b/libaf/af_format.h index 5f194c1365..73e4c88c3e 100644 --- a/libaf/af_format.h +++ b/libaf/af_format.h @@ -23,6 +23,7 @@ #ifndef MPLAYER_AF_FORMAT_H #define MPLAYER_AF_FORMAT_H +#include <endian.h> #include "config.h" // Endianness @@ -30,7 +31,7 @@ #define AF_FORMAT_LE (1<<0) // Little Endian #define AF_FORMAT_END_MASK (1<<0) -#if HAVE_BIGENDIAN // Native endian of cpu +#if BYTE_ORDER == BIG_ENDIAN #define AF_FORMAT_NE AF_FORMAT_BE #else #define AF_FORMAT_NE AF_FORMAT_LE @@ -86,7 +87,7 @@ #define AF_FORMAT_AC3_LE (AF_FORMAT_AC3|AF_FORMAT_16BIT|AF_FORMAT_LE) #define AF_FORMAT_AC3_BE (AF_FORMAT_AC3|AF_FORMAT_16BIT|AF_FORMAT_BE) -#if HAVE_BIGENDIAN +#if BYTE_ORDER == BIG_ENDIAN #define AF_FORMAT_U16_NE AF_FORMAT_U16_BE #define AF_FORMAT_S16_NE AF_FORMAT_S16_BE #define AF_FORMAT_U24_NE AF_FORMAT_U24_BE |