[Mplayer-cvslog] CVS: main/mp3lib d_cpu.h,1.4,1.5 sr1.c,1.14,1.15

[Atmosfear]

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

Modified Files:
	d_cpu.h sr1.c 
Log Message:
Fixed clashing variable.


Index: d_cpu.h
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/d_cpu.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- d_cpu.h	7 Aug 2001 17:47:20 -0000	1.4
+++ d_cpu.h	7 Aug 2001 18:14:30 -0000	1.5
@@ -10,7 +10,7 @@
 unsigned int _CpuID;
 unsigned int _i586;
 unsigned int _3dnow;
-unsigned int _isse;
+unsigned int _sse;
 unsigned int _has_mmx;
 
 extern unsigned long ASMLINK(CpuDetect)( void );

Index: sr1.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/sr1.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sr1.c	7 Aug 2001 17:47:20 -0000	1.14
+++ sr1.c	7 Aug 2001 18:14:30 -0000	1.15
@@ -390,30 +390,30 @@
 #ifndef HAVE_3DNOWEX
     _3dnow &= 1;
 #endif
-    _isse=ASMLINK(isse)();
+    _sse=ASMLINK(isse)();
 #ifndef HAVE_SSE
-    _isse = 0;
+    _sse = 0;
 #endif
 #ifndef HAVE_SSE2
-    _isse &= 1;
+    _sse &= 1;
 #endif
-    _has_mmx=_i586>1||_3dnow||_isse;
+    _has_mmx=_i586>1||_3dnow||_sse;
     printf( "mp3lib: Processor ID: %x\n",_CpuID );
-    if(_i586&&!_3dnow&&!_isse)
+    if(_i586&&!_3dnow&&!isse)
       printf( "mp3lib: Using Pentium%s optimized decore.\n",(_i586>1?"-MMX":""));
     else
-    if(_isse) 
+    if(_sse) 
     /*
        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",(_sse>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;
+      _CpuID = _i586 = _3dnow = _sse = _has_mmx = 0;
       printf( "mp3lib: Using generic decore.\n");
 #endif
 #ifdef HAVE_MMX
@@ -442,7 +442,7 @@
 
     dct36_func=dct36;
 #ifdef HAVE_SSE
-  if(_isse)
+  if(_sse)
   {
     synth_func=ASMLINK(synth_1to1_MMX);
     dct64_MMX_func=ASMLINK(dct64_MMX_sse);