diff options
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/osd.c | 3 | ||||
| -rw-r--r-- | libvo/osd_template.c | 2 | ||||
| -rw-r--r-- | libvo/vo_x11.c | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/libvo/osd.c b/libvo/osd.c index 992ffc01f3..08cda11a81 100644 --- a/libvo/osd.c +++ b/libvo/osd.c @@ -27,6 +27,7 @@ #include "osd.h" #include "mp_msg.h" #include <inttypes.h> +#include <endian.h> #include "cpudetect.h" #if ARCH_X86 @@ -35,6 +36,8 @@ static const unsigned long long mask24lh __attribute__((aligned(8))) = 0xFFFF00 static const unsigned long long mask24hl __attribute__((aligned(8))) = 0x0000FFFFFFFFFFFFULL; #endif +#define CONFIG_RUNTIME_CPUDETECT 1 + //Note: we have C, X86-nommx, MMX, MMX2, 3DNOW version therse no 3DNOW+MMX2 one //Plain C versions #if !HAVE_MMX || CONFIG_RUNTIME_CPUDETECT diff --git a/libvo/osd_template.c b/libvo/osd_template.c index 6d8305a3c5..103d169b32 100644 --- a/libvo/osd_template.c +++ b/libvo/osd_template.c @@ -320,7 +320,7 @@ static inline void RENAME(vo_draw_alpha_rgb24)(int w,int h, unsigned char* src, static inline void RENAME(vo_draw_alpha_rgb32)(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride){ int y; -#if HAVE_BIGENDIAN +#if BYTE_ORDER == BIG_ENDIAN dstbase++; #endif #if HAVE_MMX diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 9be47c9d8a..3b264b232c 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -19,6 +19,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <endian.h> #include "config.h" #include "video_out.h" @@ -261,7 +262,7 @@ static void freeMyXImage(void) ImageData = NULL; } -#if HAVE_BIGENDIAN +#if BYTE_ORDER == BIG_ENDIAN #define BO_NATIVE MSBFirst #define BO_NONNATIVE LSBFirst #else @@ -431,7 +432,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, // we can easily "emulate" them. if (out_format & 64 && (IMGFMT_IS_RGB(out_format) || IMGFMT_IS_BGR(out_format))) { out_format &= ~64; -#if HAVE_BIGENDIAN +#if BYTE_ORDER == BIG_ENDIAN out_offset = 1; #else out_offset = -1; |