--- cbp.h	2002/09/10 22:57:18	1.7
+++ cbp.h	2004/04/05 20:36:36	1.11
@@ -1,18 +1,10 @@
 /*****************************************************************************
  *
  *  XVID MPEG-4 VIDEO CODEC
- *  - cbp function (zero block flags) -
+ *  - CBP related header  -
  *
- *  Copyright(C) 2001-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.
+ *  Copyright(C) 2002-2003 Edouard Gomez <ed.gomez@free.fr>
+ *               2003      Christoph Lampert <gruel@web.de>
  *
  *  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
@@ -28,7 +20,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: cbp.h,v 1.7 2002/09/10 22:57:18 edgomez Exp $
+ * $Id: cbp.h,v 1.11 2004/04/05 20:36:36 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -37,28 +29,19 @@
 
 #include "../portab.h"
 
-/*****************************************************************************
- * Function type
- ****************************************************************************/
-
 typedef uint32_t(cbpFunc) (const int16_t * codes);
 
 typedef cbpFunc *cbpFuncPtr;
 
-/*****************************************************************************
- * Global Function pointer
- ****************************************************************************/
-
 extern cbpFuncPtr calc_cbp;
 
-/*****************************************************************************
- * Prototypes
- ****************************************************************************/
-
 extern cbpFunc calc_cbp_c;
+extern cbpFunc calc_cbp_plain;
+
+#ifdef ARCH_IS_IA32
 extern cbpFunc calc_cbp_mmx;
+extern cbpFunc calc_cbp_3dne;
 extern cbpFunc calc_cbp_sse2;
-extern cbpFunc calc_cbp_ppc;
-extern cbpFunc calc_cbp_altivec;
+#endif
 
 #endif /* _ENCODER_CBP_H_ */