summaryrefslogtreecommitdiffstats
path: root/mp3lib/sr1.c
diff options
context:
space:
mode:
authornick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-23 17:09:58 +0000
committernick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-23 17:09:58 +0000
commit58d3b8ec238540ccdfd5111246e4eae53b33e525 (patch)
treecd9ceb20cf0adf5a020c80b76a7dc75469a393f0 /mp3lib/sr1.c
parentb3b5c37c83a49d2639a02a6ca86d9c76cd47c4ba (diff)
downloadmpv-58d3b8ec238540ccdfd5111246e4eae53b33e525.tar.bz2
mpv-58d3b8ec238540ccdfd5111246e4eae53b33e525.tar.xz
Fixing compilation on non-MMX but x86 systems
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4322 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mp3lib/sr1.c')
-rw-r--r--mp3lib/sr1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index b68954c1d3..5a0960e598 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -129,7 +129,7 @@ LOCAL unsigned int getbits_fast(short number_of_bits)
// if(MP3_frames>=7741) printf("getbits_fast: bits=%d bitsleft=%d wordptr=%x\n",number_of_bits,bitsleft,wordpointer);
if((bitsleft-=number_of_bits)<0) return 0;
if(!number_of_bits) return 0;
-#if (defined(RUNTIME_CPUDETECT) && defined(CAN_COMPILE_X86_ASM)) || defined(ARCH_X86)
+#if defined(CAN_COMPILE_X86_ASM)
rval = bswap_16(*((unsigned short *)wordpointer));
#else
/*
@@ -172,7 +172,7 @@ LOCAL void set_pointer(long backstep)
LOCAL int stream_head_read(unsigned char *hbuf,unsigned long *newhead){
if(mp3_read(hbuf,4) != 4) return FALSE;
-#if (defined(RUNTIME_CPUDETECT) && defined(CAN_COMPILE_X86_ASM)) || defined(ARCH_X86)
+#if defined(CAN_COMPILE_X86_ASM)
*newhead = bswap_32(*((unsigned long *)hbuf));
#else
/*