[MPlayer-cvslog] r28334 - in trunk/libmpcodecs: ad_hwac3.c vd_ffmpeg.c vf.c vf_scale.c
gpoirier
subversion at mplayerhq.hu
Fri Jan 16 14:19:29 CET 2009
Author: gpoirier
Date: Fri Jan 16 14:19:29 2009
New Revision: 28334
Log:
revert #ifdef WORDS_BIGENDIAN => #if WORDS_BIGENDIAN changes from r28331
Modified:
trunk/libmpcodecs/ad_hwac3.c
trunk/libmpcodecs/vd_ffmpeg.c
trunk/libmpcodecs/vf.c
trunk/libmpcodecs/vf_scale.c
Modified: trunk/libmpcodecs/ad_hwac3.c
==============================================================================
--- trunk/libmpcodecs/ad_hwac3.c Fri Jan 16 13:37:56 2009 (r28333)
+++ trunk/libmpcodecs/ad_hwac3.c Fri Jan 16 14:19:29 2009 (r28334)
@@ -179,7 +179,7 @@ static int decode_audio(sh_audio_t *sh_a
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 cha
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
Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c Fri Jan 16 13:37:56 2009 (r28333)
+++ trunk/libmpcodecs/vd_ffmpeg.c Fri Jan 16 14:19:29 2009 (r28334)
@@ -892,7 +892,7 @@ static mp_image_t* decode(sh_video_t *sh
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]);
Modified: trunk/libmpcodecs/vf.c
==============================================================================
--- trunk/libmpcodecs/vf.c Fri Jan 16 13:37:56 2009 (r28333)
+++ trunk/libmpcodecs/vf.c Fri Jan 16 14:19:29 2009 (r28334)
@@ -231,7 +231,7 @@ void vf_mpi_clear(mp_image_t* mpi,int x0
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
Modified: trunk/libmpcodecs/vf_scale.c
==============================================================================
--- trunk/libmpcodecs/vf_scale.c Fri Jan 16 13:37:56 2009 (r28333)
+++ trunk/libmpcodecs/vf_scale.c Fri Jan 16 14:19:29 2009 (r28334)
@@ -322,7 +322,7 @@ static void start_slice(struct vf_instan
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;
More information about the MPlayer-cvslog
mailing list