--- emms.h	2002/07/18 13:45:14	1.7
+++ emms.h	2004/04/05 20:36:37	1.15
@@ -1,16 +1,9 @@
 /*****************************************************************************
  *
  *  XVID MPEG-4 VIDEO CODEC
- *  - emms wrapper API header -
+ *  - emms related header -
  *
- *  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.
+ *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
  *
  *  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
@@ -26,19 +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
  *
- ****************************************************************************/
-/*****************************************************************************
- *
- *  History
- *
- *  - 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.15 2004/04/05 20:36:37 edgomez Exp $
  *
  ****************************************************************************/
 
-#include "../xvid.h"
-
 #ifndef _EMMS_H_
 #define _EMMS_H_
 
@@ -56,23 +40,25 @@
 /* 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
 
+#ifdef ARCH_IS_PPC
+extern void altivec_trigger(void);
+#endif
 
 #endif