--- cbp.c	2003/10/01 23:23:01	1.10.2.3
+++ cbp.c	2003/03/09 11:30:24	1.11
@@ -1,29 +1,3 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - CBP related function  -
- *
- *  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
- *  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
- *  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
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: cbp.c,v 1.10.2.3 2003/10/01 23:23:01 edgomez Exp $
- *
- ****************************************************************************/
-
 #include "../portab.h"
 #include "cbp.h"
 
@@ -56,36 +30,36 @@
 uint32_t
 calc_cbp_c(const int16_t codes[6 * 64])
 {
-	unsigned int i=6;
+	int i, j;
 	uint32_t cbp = 0;
+/* if definition is changed (e.g. from int16_t to something like int) this routine 
+   is not possible anymore! */
 
-/* uses fixed relation: 4*codes = 1*codes64 */
-/* if prototype is changed (e.g. from int16_t to something like int32) this routine
-   has to be changed! */
-
-	do  {
-		uint64_t *codes64 = (uint64_t*)codes;	/* the compiler doesn't really make this */
-		uint32_t *codes32 = (uint32_t*)codes;	/* variables, just "addressing modes" */
+   for (i = 5; i >= 0; i--, codes += 64) {
 
-		cbp += cbp;
-        if (codes[1] || codes32[1]) {
+		uint64_t *codes64 = (uint64_t*)codes;
+		cbp += cbp; 
+        if (codes[1] || codes[2] || codes[3]) {
 			cbp++;
+			continue;
 		}
-        else if (codes64[1] | codes64[2] | codes64[3]) {
+        if (codes64[1] | codes64[2] | codes64[3]) {
 			cbp++;
+			continue;
 		}
-        else if (codes64[4] | codes64[5] | codes64[6] | codes64[7]) {
+        if (codes64[4] | codes64[5] | codes64[6] | codes64[7]) {
 			cbp++;
+			continue;
 		}
-        else if (codes64[8] | codes64[9] | codes64[10] | codes64[11]) {
+        if (codes64[8] | codes64[9] | codes64[10] | codes64[11]) {
 			cbp++;
+			continue;
 		}
-        else if (codes64[12] | codes64[13] | codes64[14] | codes64[15]) {
+        if (codes64[12] | codes64[13] | codes64[14] | codes64[15]) {
 			cbp++;
+			continue;
 		}
-		codes += 64;
-		i--;
-    } while (i != 0);
+    }
 
 	return cbp;
 }
@@ -94,7 +68,7 @@
 
 
 /* older code maybe better on some plattforms? */
-#if 0
+#if (0==1)
 	for (i = 5; i >= 0; i--) {
 		if (codes[1] | codes[2] | codes[3])
                         cbp |= 1 << i;