[MPlayer-cvslog] r28374 - in trunk: libaf/af_format.c libaf/af_format.h libmpdemux/demux_xmms.c libmpdemux/demuxer.h mp3lib/decod386.c
diego
subversion at mplayerhq.hu
Mon Jan 26 10:56:27 CET 2009
Author: diego
Date: Mon Jan 26 10:56:27 2009
New Revision: 28374
Log:
WORDS_BIGENDIAN is defined/undefined, not 0/1.
Modified:
trunk/libaf/af_format.c
trunk/libaf/af_format.h
trunk/libmpdemux/demux_xmms.c
trunk/libmpdemux/demuxer.h
trunk/mp3lib/decod386.c
Modified: trunk/libaf/af_format.c
==============================================================================
--- trunk/libaf/af_format.c Mon Jan 26 10:55:59 2009 (r28373)
+++ trunk/libaf/af_format.c Mon Jan 26 10:56:27 2009 (r28374)
@@ -332,7 +332,7 @@ af_info_t af_info_format = {
};
static inline uint32_t load24bit(void* data, int pos) {
-#if WORDS_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
return (((uint32_t)((uint8_t*)data)[3*pos])<<24) |
(((uint32_t)((uint8_t*)data)[3*pos+1])<<16) |
(((uint32_t)((uint8_t*)data)[3*pos+2])<<8);
@@ -344,7 +344,7 @@ static inline uint32_t load24bit(void* d
}
static inline void store24bit(void* data, int pos, uint32_t expanded_value) {
-#if WORDS_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
((uint8_t*)data)[3*pos]=expanded_value>>24;
((uint8_t*)data)[3*pos+1]=expanded_value>>16;
((uint8_t*)data)[3*pos+2]=expanded_value>>8;
Modified: trunk/libaf/af_format.h
==============================================================================
--- trunk/libaf/af_format.h Mon Jan 26 10:55:59 2009 (r28373)
+++ trunk/libaf/af_format.h Mon Jan 26 10:56:27 2009 (r28374)
@@ -30,7 +30,7 @@
#define AF_FORMAT_LE (1<<0) // Little Endian
#define AF_FORMAT_END_MASK (1<<0)
-#if WORDS_BIGENDIAN // Native endian of cpu
+#ifdef WORDS_BIGENDIAN // Native endian of cpu
#define AF_FORMAT_NE AF_FORMAT_BE
#else
#define AF_FORMAT_NE AF_FORMAT_LE
Modified: trunk/libmpdemux/demux_xmms.c
==============================================================================
--- trunk/libmpdemux/demux_xmms.c Mon Jan 26 10:55:59 2009 (r28373)
+++ trunk/libmpdemux/demux_xmms.c Mon Jan 26 10:56:27 2009 (r28374)
@@ -101,7 +101,7 @@ static int disk_open(AFormat fmt, int ra
xmms_afmt=AF_FORMAT_U16_LE;
break;
case FMT_U16_NE:
-#if WORDS_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
xmms_afmt=AF_FORMAT_U16_BE;
#else
xmms_afmt=AF_FORMAT_U16_LE;
Modified: trunk/libmpdemux/demuxer.h
==============================================================================
--- trunk/libmpdemux/demuxer.h Mon Jan 26 10:55:59 2009 (r28373)
+++ trunk/libmpdemux/demuxer.h Mon Jan 26 10:56:27 2009 (r28374)
@@ -367,7 +367,7 @@ stream_t* new_ds_stream(demux_stream_t *
static inline int avi_stream_id(unsigned int id){
unsigned char *p=(unsigned char *)&id;
unsigned char a,b;
-#if WORDS_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
a=p[3]-'0'; b=p[2]-'0';
#else
a=p[0]-'0'; b=p[1]-'0';
Modified: trunk/mp3lib/decod386.c
==============================================================================
--- trunk/mp3lib/decod386.c Mon Jan 26 10:55:59 2009 (r28373)
+++ trunk/mp3lib/decod386.c Mon Jan 26 10:56:27 2009 (r28374)
@@ -54,7 +54,7 @@
* layouts of double floating point values an all cpu architectures. If
* it doesn't work for you, just enable the "old WRITE_SAMPLE" macro.
*/
-#if WORDS_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
#define MANTISSA_OFFSET 1
#else
#define MANTISSA_OFFSET 0
More information about the MPlayer-cvslog
mailing list