summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2007-09-09 22:47:28 +0000
committerJens Arnold <amiconn@rockbox.org>2007-09-09 22:47:28 +0000
commit2e305c6381c72aaabc6d0f92459b32d8939691fb (patch)
tree2f3bb0492d582fcad40e4df38fe195a9f6473abe
parentcd9b51274f383e8b4c463b4467e873604675ecc2 (diff)
downloadrockbox-2e305c6381c72aaabc6d0f92459b32d8939691fb.tar.gz
rockbox-2e305c6381c72aaabc6d0f92459b32d8939691fb.zip
Repair mpegplayer on 64 bit sims. No reason for doing fancy bitshifting opts, this is all compile time...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14659 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 4af4ed2ca4..481454dc87 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -451,14 +451,14 @@ static void init_mad(void* mad_frame_overlap)
#else
/* Don't know what this is - use bytewise comparisons */
#define CMP_3_CONST(a, b) \
- (( ((a)[0] ^ ((b) >> 24)) | \
- ((a)[1] ^ ((b) << 8 >> 24)) | \
- ((a)[2] ^ ((b) << 16 >> 24)) ) == 0)
+ (( ((a)[0] ^ (((b) >> 24) & 0xff)) | \
+ ((a)[1] ^ (((b) >> 16) & 0xff)) | \
+ ((a)[2] ^ (((b) >> 8) & 0xff)) ) == 0)
#define CMP_4_CONST(a, b) \
- (( ((a)[0] ^ ((b) >> 24)) | \
- ((a)[1] ^ ((b) << 8 >> 24)) | \
- ((a)[2] ^ ((b) << 16 >> 24)) | \
- ((a)[3] ^ ((b) << 24 >> 24)) ) == 0)
+ (( ((a)[0] ^ (((b) >> 24) & 0xff)) | \
+ ((a)[1] ^ (((b) >> 16) & 0xff)) | \
+ ((a)[2] ^ (((b) >> 8) & 0xff)) | \
+ ((a)[3] ^ ((b) & 0xff)) ) == 0)
#endif
/* Codes for various header byte sequences - MSB represents lowest memory