diff options
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/asf.h | 6 | ||||
| -rw-r--r-- | libmpdemux/aviheader.h | 5 | ||||
| -rw-r--r-- | libmpdemux/ms_hdr.h | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h index a2bf546fd1..ba1eff6e7f 100644 --- a/libmpdemux/asf.h +++ b/libmpdemux/asf.h @@ -19,7 +19,7 @@ #ifndef MPLAYER_ASF_H #define MPLAYER_ASF_H -//#include "config.h" /* for HAVE_BIGENDIAN */ +#include <endian.h> #include <inttypes.h> #include "libavutil/common.h" #include "mpbswap.h" @@ -105,7 +105,7 @@ typedef struct __attribute__((packed)) { } ASF_stream_chunck_t; // Definition of the stream type -#if HAVE_BIGENDIAN +#if BYTE_ORDER == BIG_ENDIAN #define ASF_STREAMING_CLEAR 0x2443 // $C #define ASF_STREAMING_DATA 0x2444 // $D #define ASF_STREAMING_END_TRANS 0x2445 // $E @@ -140,7 +140,7 @@ typedef struct { * Some macros to swap little endian structures read from an ASF file * into machine endian format */ -#if HAVE_BIGENDIAN +#if BYTE_ORDER == BIG_ENDIAN #define le2me_ASF_obj_header_t(h) { \ (h)->size = le2me_64((h)->size); \ } diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h index 8d226606de..a65ee15392 100644 --- a/libmpdemux/aviheader.h +++ b/libmpdemux/aviheader.h @@ -21,7 +21,8 @@ #include <sys/types.h> #include <stdint.h> -#include "config.h" /* get correct definition of HAVE_BIGENDIAN */ +#include <endian.h> +#include "config.h" #include "libavutil/common.h" #include "mpbswap.h" @@ -229,7 +230,7 @@ typedef enum { * Some macros to swap little endian structures read from an AVI file * into machine endian format */ -#if HAVE_BIGENDIAN +#if BYTE_ORDER == BIG_ENDIAN #define le2me_MainAVIHeader(h) { \ (h)->dwMicroSecPerFrame = le2me_32((h)->dwMicroSecPerFrame); \ (h)->dwMaxBytesPerSec = le2me_32((h)->dwMaxBytesPerSec); \ diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h index 3d6bc07545..5b5dff6008 100644 --- a/libmpdemux/ms_hdr.h +++ b/libmpdemux/ms_hdr.h @@ -19,6 +19,7 @@ #ifndef MPLAYER_MS_HDR_H #define MPLAYER_MS_HDR_H +#include <endian.h> #include "config.h" #ifndef _WAVEFORMATEX_ @@ -81,7 +82,7 @@ typedef struct { #endif #ifndef le2me_BITMAPINFOHEADER -#if HAVE_BIGENDIAN +#if BYTE_ORDER == BIG_ENDIAN #define le2me_BITMAPINFOHEADER(h) { \ (h)->biSize = le2me_32((h)->biSize); \ (h)->biWidth = le2me_32((h)->biWidth); \ |