--- emms.h	2002/10/19 11:41:11	1.9
+++ emms.h	2004/03/22 22:36:24	1.14
@@ -1,19 +1,10 @@
 /*****************************************************************************
  *
  *  XVID MPEG-4 VIDEO CODEC
- *  - emms wrapper API header -
+ *  - emms related header -
  *
  *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
  *
- *  This program is an implementation of a part of one or more MPEG-4
- *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
- *  to use this software module in hardware or software products are
- *  advised that its use may infringe existing patents or copyrights, and
- *  any such use would be at such party's own risk.  The original
- *  developer of this software module and his/her company, and subsequent
- *  editors and their companies, will have no liability for use of this
- *  software or modifications or derivatives thereof.
- *
  *  This program is free software ; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation ; either version 2 of the License, or
@@ -28,12 +19,10 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: emms.h,v 1.9 2002/10/19 11:41:11 edgomez Exp $
+ * $Id: emms.h,v 1.14 2004/03/22 22:36:24 edgomez Exp $
  *
  ****************************************************************************/
 
-#include "../xvid.h"
-
 #ifndef _EMMS_H_
 #define _EMMS_H_
 
@@ -51,22 +40,21 @@
 /* Implemented functions */
 
 emmsFunc emms_c;
+
+#ifdef ARCH_IS_IA32
 emmsFunc emms_mmx;
+emmsFunc emms_3dn;
+#endif
 
 /*****************************************************************************
  * Prototypes
  ****************************************************************************/
 
-#ifdef ARCH_X86
+#ifdef ARCH_IS_IA32
+/* 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