[Mplayer-cvslog] CVS: main/mp3lib decod386.c,1.10,1.11 sr1.c,1.18,1.19

[Nick Kurshev]

Update of /cvsroot/mplayer/main/mp3lib
In directory mplayer:/var/tmp.root/cvs-serv25393/main/mp3lib

Modified Files:
	decod386.c sr1.c 
Log Message:
Fixing compilation on non-MMX but x86 systems

Index: decod386.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decod386.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- decod386.c	14 Jan 2002 16:15:59 -0000	1.10
+++ decod386.c	23 Jan 2002 17:09:58 -0000	1.11
@@ -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 @@
 
 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 @@
   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;

Index: sr1.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/sr1.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sr1.c	19 Jan 2002 18:22:22 -0000	1.18
+++ sr1.c	23 Jan 2002 17:09:58 -0000	1.19
@@ -129,7 +129,7 @@
 //  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 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
   /*