--- emms.h	2003/02/09 19:32:52	1.12
+++ emms.h	2003/02/15 15:22:19	1.13
@@ -3,59 +3,40 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - emms wrapper API header -
  *
- *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
- *
- *  This file is part of XviD, a free MPEG-4 video encoder/decoder
- *
- *  XviD 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
+ *  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
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
+ *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- *  Under section 8 of the GNU General Public License, the copyright
- *  holders of XVID explicitly forbid distribution in the following
- *  countries:
- *
- *    - Japan
- *    - United States of America
- *
- *  Linking XviD statically or dynamically with other modules is making a
- *  combined work based on XviD.  Thus, the terms and conditions of the
- *  GNU General Public License cover the whole combination.
- *
- *  As a special exception, the copyright holders of XviD give you
- *  permission to link XviD with independent modules that communicate with
- *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
- *  license terms of these independent modules, and to copy and distribute
- *  the resulting combined work under terms of your choice, provided that
- *  every copy of the combined work is accompanied by a complete copy of
- *  the source code of XviD (the version of XviD used to produce the
- *  combined work), being distributed under the terms of the GNU General
- *  Public License plus this exception.  An independent module is a module
- *  which is not derived from or based on XviD.
- *
- *  Note that people who make modified versions of XviD are not obligated
- *  to grant this special exception for their modified versions; it is
- *  their choice whether to do so.  The GNU General Public License gives
- *  permission to release a modified version without this exception; this
- *  exception also makes it possible to release a modified version which
- *  carries forward this exception.
+ ****************************************************************************/
+/*****************************************************************************
  *
- * $Id: emms.h,v 1.12 2003/02/09 19:32:52 edgomez Exp $
+ *  History
+ *
+ *  - Mon Jun 17 00:16:13 2002 Added legal header
+ *
+ *  $Id: emms.h,v 1.13 2003/02/15 15:22:19 edgomez Exp $
  *
  ****************************************************************************/
 
-#include "../xvid.h"
-
 #ifndef _EMMS_H_
 #define _EMMS_H_
 
@@ -63,7 +44,7 @@
  * emms API
  ****************************************************************************/
 
-typedef void (emmsFunc) (void);
+typedef void (emmsFunc) ();
 
 typedef emmsFunc *emmsFuncPtr;
 
@@ -74,19 +55,17 @@
 
 emmsFunc emms_c;
 emmsFunc emms_mmx;
+emmsFunc emms_3dn;
 
 /*****************************************************************************
  * Prototypes
  ****************************************************************************/
 
-#if defined(ARCH_IS_IA32)
+#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);
-#elif defined(ARCH_IS_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