[svn] / branches / dev-api-4 / xvidcore / src / utils / emms.h Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/utils/emms.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 824, Sun Feb 9 19:32:52 2003 UTC revision 851, Sat Feb 15 15:22:19 2003 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - emms wrapper API header -   *  - emms wrapper API header -
5   *   *
6   *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>   *  This program is an implementation of a part of one or more MPEG-4
7     *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
8     *  to use this software module in hardware or software products are
9     *  advised that its use may infringe existing patents or copyrights, and
10     *  any such use would be at such party's own risk.  The original
11     *  developer of this software module and his/her company, and subsequent
12     *  editors and their companies, will have no liability for use of this
13     *  software or modifications or derivatives thereof.
14   *   *
15   *  This file is part of XviD, a free MPEG-4 video encoder/decoder   *  This program is free software ; you can redistribute it and/or modify
16   *   *  it under the terms of the GNU General Public License as published by
  *  XviD is free software; you can redistribute it and/or modify it  
  *  under the terms of the GNU General Public License as published by  
17   *  the Free Software Foundation; either version 2 of the License, or   *  the Free Software Foundation; either version 2 of the License, or
18   *  (at your option) any later version.   *  (at your option) any later version.
19   *   *
# Line 21  Line 26 
26   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
27   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
28   *   *
29   *  Under section 8 of the GNU General Public License, the copyright   ****************************************************************************/
30   *  holders of XVID explicitly forbid distribution in the following  /*****************************************************************************
31   *  countries:   *
32   *   *  History
33   *    - Japan   *
34   *    - United States of America   *  - Mon Jun 17 00:16:13 2002 Added legal header
  *  
  *  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.  
35   *   *
36   * $Id: emms.h,v 1.12 2003-02-09 19:32:52 edgomez Exp $   *  $Id: emms.h,v 1.13 2003-02-15 15:22:19 edgomez Exp $
37   *   *
38   ****************************************************************************/   ****************************************************************************/
39    
 #include "../xvid.h"  
   
40  #ifndef _EMMS_H_  #ifndef _EMMS_H_
41  #define _EMMS_H_  #define _EMMS_H_
42    
# Line 63  Line 44 
44   * emms API   * emms API
45   ****************************************************************************/   ****************************************************************************/
46    
47  typedef void (emmsFunc) (void);  typedef void (emmsFunc) ();
48    
49  typedef emmsFunc *emmsFuncPtr;  typedef emmsFunc *emmsFuncPtr;
50    
# Line 74  Line 55 
55    
56  emmsFunc emms_c;  emmsFunc emms_c;
57  emmsFunc emms_mmx;  emmsFunc emms_mmx;
58    emmsFunc emms_3dn;
59    
60  /*****************************************************************************  /*****************************************************************************
61   * Prototypes   * Prototypes
62   ****************************************************************************/   ****************************************************************************/
63    
64  #if defined(ARCH_IS_IA32)  #ifdef ARCH_IS_IA32
65    /* cpu_flag detection helper functions */
66  extern int check_cpu_features(void);  extern int check_cpu_features(void);
67  extern void sse_os_trigger(void);  extern void sse_os_trigger(void);
68  extern void sse2_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? */  
69  #endif  #endif
70    
71    

Legend:
Removed from v.824  
changed lines
  Added in v.851

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4