From 0f224d32dcb47d393e9c935409bbebd485efdc10 Mon Sep 17 00:00:00 2001 From: gpoirier Date: Fri, 16 Jan 2009 13:19:29 +0000 Subject: revert #ifdef WORDS_BIGENDIAN => #if WORDS_BIGENDIAN changes from r28331 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28334 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_hwac3.c | 4 ++-- libmpcodecs/vd_ffmpeg.c | 2 +- libmpcodecs/vf.c | 2 +- libmpcodecs/vf_scale.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c index c4b0e70b29..1757018796 100644 --- a/libmpcodecs/ad_hwac3.c +++ b/libmpcodecs/ad_hwac3.c @@ -179,7 +179,7 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m buf16[2] = 0x0001; // data-type ac3 buf16[2] |= (sh_audio->a_in_buffer[5] & 0x7) << 8; // bsmod buf16[3] = len << 3; // number of bits in payload -#if WORDS_BIGENDIAN +#ifdef WORDS_BIGENDIAN memcpy(buf + 8, sh_audio->a_in_buffer, len); #else swab(sh_audio->a_in_buffer, buf + 8, len); @@ -523,7 +523,7 @@ static int decode_audio_dts(unsigned char *indata_ptr, int len, unsigned char *b buf16[3] = fsize << 3; if (!convert_16bits) { -#if WORDS_BIGENDIAN +#ifdef WORDS_BIGENDIAN /* BE stream */ if (indata_ptr[0] == 0x1f || indata_ptr[0] == 0x7f) #else diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 06862fef0c..c59e9f1b8b 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -892,7 +892,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ mpi->stride[2]*=2; } -#if WORDS_BIGENDIAN +#ifdef WORDS_BIGENDIAN // FIXME: this might cause problems for buffers with FF_BUFFER_HINTS_PRESERVE if (mpi->bpp == 8) swap_palette(mpi->planes[1]); diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 812c4dca36..cd181156f4 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -231,7 +231,7 @@ void vf_mpi_clear(mp_image_t* mpi,int x0,int y0,int w,int h){ unsigned int* p=(unsigned int*) dst; int size=(mpi->bpp>>3)*w/4; int i; -#if WORDS_BIGENDIAN +#ifdef WORDS_BIGENDIAN #define CLEAR_PACKEDYUV_PATTERN 0x00800080 #define CLEAR_PACKEDYUV_PATTERN_SWAPPED 0x80008000 #else diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index d0a87feecd..b6c683c430 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -322,7 +322,7 @@ static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){ static void scale(struct SwsContext *sws1, struct SwsContext *sws2, uint8_t *src[3], int src_stride[3], int y, int h, uint8_t *dst[3], int dst_stride[3], int interlaced){ uint8_t *src2[3]={src[0], src[1], src[2]}; -#if WORDS_BIGENDIAN +#ifdef WORDS_BIGENDIAN uint32_t pal2[256]; if (src[1] && !src[2]){ int i; -- cgit v1.2.3