-# define CPU_CAPABILITY_MMX (1<<3)
-# define CPU_CAPABILITY_3DNOW (1<<4)
-# define CPU_CAPABILITY_MMXEXT (1<<5)
-# define CPU_CAPABILITY_SSE (1<<6)
-# define CPU_CAPABILITY_SSE2 (1<<7)
-# define CPU_CAPABILITY_SSE3 (1<<8)
-# define CPU_CAPABILITY_SSSE3 (1<<9)
-# define CPU_CAPABILITY_SSE4_1 (1<<10)
-# define CPU_CAPABILITY_SSE4_2 (1<<11)
-# define CPU_CAPABILITY_SSE4A (1<<12)
+# define HAVE_FPU 1
+# define VLC_CPU_MMX 0x00000008
+# define VLC_CPU_3dNOW 0x00000010
+# define VLC_CPU_MMXEXT 0x00000020
+# define VLC_CPU_SSE 0x00000040
+# define VLC_CPU_SSE2 0x00000080
+# define VLC_CPU_SSE3 0x00000100
+# define VLC_CPU_SSSE3 0x00000200
+# define VLC_CPU_SSE4_1 0x00000400
+# define VLC_CPU_SSE4_2 0x00000800
+# define VLC_CPU_SSE4A 0x00001000
+# define VLC_CPU_AVX 0x00002000
+# define VLC_CPU_AVX2 0x00004000
+# define VLC_CPU_XOP 0x00008000
+# define VLC_CPU_FMA4 0x00010000
+
+# if defined (__MMX__)
+# define vlc_CPU_MMX() (1)
+# define VLC_MMX