From 183da5e69351bf365d9e3efc7c1716f7e3b01840 Mon Sep 17 00:00:00 2001
From: nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 2 Jul 2001 08:07:41 +0000
Subject: [PATCH] Minor fixes

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1254 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mp3lib/d_cpu.s | 12 ++++++------
 mp3lib/sr1.c   |  9 +++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/mp3lib/d_cpu.s b/mp3lib/d_cpu.s
index 6df924b241..0481521630 100644
--- a/mp3lib/d_cpu.s
+++ b/mp3lib/d_cpu.s
@@ -48,7 +48,7 @@ exit_cpudetect:
 /  in C: unsigled long ipentium( void );
 /  return: 0 if this processor i386 or i486
 /          1 otherwise
-/          2 if this cpu supports mmx
+/          3 if this cpu supports mmx
 / ---------------------------------------------------------------------------
 ipentium:
         pushl  %ebx
@@ -74,7 +74,7 @@ ipentium:
         incl   %eax
 	test   $0x00800000, %edx
 	jz     exit
-	incl   %eax
+	orl    $2, %eax
         jmp    exit
 no_cpuid:
         xorl   %eax,%eax
@@ -88,7 +88,7 @@ exit:
 /  in C: unsigned long a3dnow( void );
 /  return: 0 if this processor does not support 3dnow!
 /          1 otherwise
-/          2 if this cpu supports 3dnow-dsp extension
+/          3 if this cpu supports 3dnow-dsp extension
 / ---------------------------------------------------------------------------
 a3dnow:
         pushl  %ebx
@@ -114,7 +114,7 @@ a3dnow:
         testl  $0x40000000,%edx
         jz     exit2
 /// eax=2 - K7 3DNowEx!	
-        inc    %eax
+        orl    $2, %eax
 exit2:
 
         popl   %ecx
@@ -126,7 +126,7 @@ exit2:
 /  in C: unsigned long isse( void );
 /  return: 0 if this processor does not support sse
 /          1 otherwise
-/          2 if this cpu supports sse2 extension
+/          3 if this cpu supports sse2 extension
 / ---------------------------------------------------------------------------
 isse:
         pushl  %ebx
@@ -145,7 +145,7 @@ isse:
 	incl   %eax
         testl  $0x04000000,%edx
         jz     exit3
-        incl   %eax
+        orl    $2, %eax
 exit3:
         popl   %ecx
         popl   %edx
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index 7ada065875..b866bf29e3 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -355,6 +355,7 @@ void MP3_Init(int fakemono){
 #else
 void MP3_Init(){
 #endif
+#ifdef ARCH_X86
     _CpuID=CpuDetect();
     _i586=ipentium();
 #ifndef HAVE_MMX
@@ -384,11 +385,15 @@ void MP3_Init(){
        Note: It's ok, Since K8 will have SSE2 support and will much faster
        of P4 ;) 
      */
-      printf( "mp3lib: Using SSE%s! optimized decore.\n",(_isse>1?"2":""));
+//      printf( "mp3lib: Using SSE%s! optimized decore.\n",(_isse>1?"2":""));
+      printf( "mp3lib: Using Pentium%s optimized decore.\n",(_i586>1?"-MMX":""));
     else
     if(_3dnow)
       printf( "mp3lib: Using AMD 3dnow%s! optimized decore.\n",(_3dnow>1?"-dsp(k7)":""));
-
+#else
+      _CpuID = _i586 = _3dnow = _isse = _has_mmx = 0;
+      printf( "mp3lib: Using generic decore.\n");
+#endif
 /* Use it for any MMX cpu */
    if(_has_mmx)	make_decode_tables_MMX(outscale);
    else		make_decode_tables(outscale);