--- cbp.h	2002/11/17 00:57:57	1.8
+++ cbp.h	2004/03/22 22:36:23	1.10
@@ -1,56 +1,26 @@
 /*****************************************************************************
  *
  *  XVID MPEG-4 VIDEO CODEC
- *  - cbp function (zero block flags) -
+ *  - CBP related header  -
  *
- *  Copyright(C) 2001-2002  Michael Militzer <isibaar@xvid.org>
+ *  Copyright(C) 2002-2003 Edouard Gomez <ed.gomez@free.fr>
+ *               2003      Christoph Lampert <gruel@web.de>
  *
- *  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 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: cbp.h,v 1.8 2002/11/17 00:57:57 edgomez Exp $
+ * $Id: cbp.h,v 1.10 2004/03/22 22:36:23 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -59,28 +29,27 @@
 
 #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;
+#endif
+
+#ifdef ARCH_IS_PPC
 extern cbpFunc calc_cbp_ppc;
+#endif
+
+#ifdef ARCH_IS_ALTIVEC
 extern cbpFunc calc_cbp_altivec;
+#endif
 
 #endif /* _ENCODER_CBP_H_ */