diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-29 01:32:03 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-29 01:32:03 +0300 |
| commit | 4a36b51ea62bae47ea9bf8df3031c88a1992b7a6 (patch) | |
| tree | 8ade74ff57f052e87f36b763703ffc03af823001 /libvo | |
| parent | c73217c07a98013887f507849c18eeac1257df58 (diff) | |
| parent | 45b7b9374bb2a772baa34a52d1abac11c939de15 (diff) | |
| download | mpv-4a36b51ea62bae47ea9bf8df3031c88a1992b7a6.tar.bz2 mpv-4a36b51ea62bae47ea9bf8df3031c88a1992b7a6.tar.xz | |
Merge svn changes up to r29455
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/osd_template.c | 2 | ||||
| -rw-r--r-- | libvo/vo_svga.c | 2 | ||||
| -rw-r--r-- | libvo/vo_tga.c | 2 | ||||
| -rw-r--r-- | libvo/vo_x11.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libvo/osd_template.c b/libvo/osd_template.c index e59b4e5681..6d8305a3c5 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; -#ifdef WORDS_BIGENDIAN +#if HAVE_BIGENDIAN dstbase++; #endif #if HAVE_MMX diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c index 433f8d76ef..ed68fd79a6 100644 --- a/libvo/vo_svga.c +++ b/libvo/vo_svga.c @@ -635,7 +635,7 @@ static int query_format(uint32_t format) { if( (!IMGFMT_IS_RGB(format)) && (!IMGFMT_IS_BGR(format)) ) return 0; // Reject different endian -#ifdef WORDS_BIGENDIAN +#if HAVE_BIGENDIAN if (IMGFMT_IS_BGR(format)) return 0; #else if (IMGFMT_IS_RGB(format)) return 0; diff --git a/libvo/vo_tga.c b/libvo/vo_tga.c index 707455b4ea..38299aca88 100644 --- a/libvo/vo_tga.c +++ b/libvo/vo_tga.c @@ -138,7 +138,7 @@ static int write_tga( char *file, int bpp, int dx, int dy, uint8_t *buf, int str s = buf; d = line_buff; for(x = 0; x < dx; x++) { - #ifdef WORDS_BIGENDIAN + #if HAVE_BIGENDIAN d[0] = s[3]; d[1] = s[2]; d[2] = s[1]; diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index d1120ae927..938640a809 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -262,7 +262,7 @@ static void freeMyXImage(void) ImageData = NULL; } -#ifdef WORDS_BIGENDIAN +#if HAVE_BIGENDIAN #define BO_NATIVE MSBFirst #define BO_NONNATIVE LSBFirst #else @@ -446,7 +446,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; -#ifdef WORDS_BIGENDIAN +#if HAVE_BIGENDIAN out_offset = 1; #else out_offset = -1; |