Remove unused 486 and 586 capabilities

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 6d9ba10f0cb58e5a2bebb6c7ac86bc9f0706f937..a8afe161132990c2e5c00345fc352428864db965 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -789,8 +789,6 @@ VLC_EXPORT(int, vlc_wclosedir, ( void *_p_dir ));
  * CPU capabilities
  *****************************************************************************/
 #define CPU_CAPABILITY_NONE    0
-#define CPU_CAPABILITY_486     (1<<0)
-#define CPU_CAPABILITY_586     (1<<1)
 #define CPU_CAPABILITY_MMX     (1<<3)
 #define CPU_CAPABILITY_3DNOW   (1<<4)
 #define CPU_CAPABILITY_MMXEXT  (1<<5)

diff --git a/src/libvlc.c b/src/libvlc.c
index 3eb5abdc0052f57e583bc3b67f7eae444a394ec6..d216bb74b6781648c6ad8406e47d9bf877d4a316 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -766,8 +766,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     }
 
     p_capabilities[0] = '\0';
-    PRINT_CAPABILITY( CPU_CAPABILITY_486, "486" );
-    PRINT_CAPABILITY( CPU_CAPABILITY_586, "586" );
     PRINT_CAPABILITY( CPU_CAPABILITY_MMX, "MMX" );
     PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" );
     PRINT_CAPABILITY( CPU_CAPABILITY_MMXEXT, "MMXEXT" );

diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index 5a6a5e4e71e2d3b1b03f5b9d4aaaad464882fbee..2bbff245f05aa6dea38488d927fd3bdf3e82b0ba 100644 (file)
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -138,8 +138,6 @@ uint32_t CPUCapabilities( void )
         goto out;
 # endif
 
-    i_capabilities |= CPU_CAPABILITY_486;
-
     /* the CPU supports the CPUID instruction - get its level */
     cpuid( 0x00000000 );
 
@@ -150,9 +148,6 @@ uint32_t CPUCapabilities( void )
         goto out;
 #endif
 
-    /* FIXME: this isn't correct, since some 486s have cpuid */
-    i_capabilities |= CPU_CAPABILITY_586;
-
     /* borrowed from mpeg2dec */
     b_amd = ( i_ebx == 0x68747541 ) && ( i_ecx == 0x444d4163 )
                     && ( i_edx == 0x69746e65 );