diff options
author | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-23 17:09:58 +0000 |
---|---|---|
committer | nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-23 17:09:58 +0000 |
commit | 58d3b8ec238540ccdfd5111246e4eae53b33e525 (patch) | |
tree | cd9ceb20cf0adf5a020c80b76a7dc75469a393f0 /mp3lib | |
parent | b3b5c37c83a49d2639a02a6ca86d9c76cd47c4ba (diff) | |
download | mpv-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')
-rw-r--r-- | mp3lib/decod386.c | 11 | ||||
-rw-r--r-- | mp3lib/sr1.c | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/mp3lib/decod386.c b/mp3lib/decod386.c index 643e17bbd7..5928270958 100644 --- a/mp3lib/decod386.c +++ b/mp3lib/decod386.c @@ -13,6 +13,13 @@ #include "../config.h" +#ifndef CAN_COMPILE_X86 +#ifdef ARCH_X86 +#define CAN_COMPILE_X86 +#endif +#endif + + #if 0 /* old WRITE_SAMPLE */ /* is portable */ @@ -149,7 +156,7 @@ static int synth_1to1_r(real *bandPtr,int channel,unsigned char *out,int *pnt) synth_func_t synth_func; -#if (defined(RUNTIME_CPUDETECT) && defined(CAN_COMPILE_X86_ASM)) || defined(HAVE_MMX) +#if defined(CAN_COMPILE_X86_ASM) int synth_1to1_MMX( real *bandPtr,int channel,short * samples) { static short buffs[2][2][0x110]; @@ -169,7 +176,7 @@ static int synth_1to1(real *bandPtr,int channel,unsigned char *out,int *pnt) int clip = 0; int bo1; /* optimized for x86 */ -#if (defined(RUNTIME_CPUDETECT) && defined(CAN_COMPILE_X86_ASM)) || defined(ARCH_X86) +#if defined(CAN_COMPILE_X86_ASM) if ( synth_func ) { int ret; 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 /* |