--- emms.h	2002/07/18 13:45:14	1.7
+++ emms.h	2003/01/05 03:31:26	1.7.2.2
@@ -33,12 +33,10 @@
  *
  *  - Mon Jun 17 00:16:13 2002 Added legal header
  *
- *  $Id: emms.h,v 1.7 2002/07/18 13:45:14 suxen_drol Exp $
+ *  $Id: emms.h,v 1.7.2.2 2003/01/05 03:31:26 suxen_drol Exp $
  *
  ****************************************************************************/
 
-#include "../xvid.h"
-
 #ifndef _EMMS_H_
 #define _EMMS_H_
 
@@ -57,21 +55,17 @@
 
 emmsFunc emms_c;
 emmsFunc emms_mmx;
+emmsFunc emms_3dn;
 
 /*****************************************************************************
  * Prototypes
  ****************************************************************************/
 
 #ifdef ARCH_X86
+/* cpu_flag detection helper functions */
 extern int check_cpu_features(void);
 extern void sse_os_trigger(void);
 extern void sse2_os_trigger(void);
-#else
-#ifdef ARCH_IA64
-static int check_cpu_features(void) { return XVID_CPU_IA64; }
-#else
-static int check_cpu_features(void) { return 0; } /* is 0 an acceptable value? */
-#endif
 #endif