# HG changeset patch
# User diego
# Date 1160468201 0
# Node ID bb186452e7da04b9d35e21b6b13962da42eb2c9d
# Parent  fec25fd9febf69976e7f20da7b39fb19e88ae539
BRANCHLESS_CABAD --> BRANCHLESS_CABAC_DECODER

diff -r fec25fd9febf -r bb186452e7da cabac.c
--- a/cabac.c	Tue Oct 10 08:01:19 2006 +0000
+++ b/cabac.c	Tue Oct 10 08:16:41 2006 +0000
@@ -133,7 +133,7 @@
         c->mps_state[2*i+1]= 2*mps_state[i]+1;
 
         if( i ){
-#ifdef BRANCHLESS_CABAD
+#ifdef BRANCHLESS_CABAC_DECODER
             c->mps_state[-2*i-1]= 2*lps_state[i]+0; //FIXME yes this is not valid C but iam lazy, cleanup welcome
             c->mps_state[-2*i-2]= 2*lps_state[i]+1;
         }else{
diff -r fec25fd9febf -r bb186452e7da cabac.h
--- a/cabac.h	Tue Oct 10 08:01:19 2006 +0000
+++ b/cabac.h	Tue Oct 10 08:16:41 2006 +0000
@@ -31,7 +31,7 @@
 
 #define CABAC_BITS 16
 #define CABAC_MASK ((1<<CABAC_BITS)-1)
-#define BRANCHLESS_CABAD 1
+#define BRANCHLESS_CABAC_DECODER 1
 
 typedef struct CABACContext{
     int low;
@@ -375,7 +375,7 @@
 #define BYTESTART   "12+2*65*4+4*64"
 #define BYTE        "16+2*65*4+4*64"
 #define BYTEEND     "20+2*65*4+4*64"
-#ifndef BRANCHLESS_CABAD
+#ifndef BRANCHLESS_CABAC_DECODER
     asm volatile(
         "movzbl (%1), %%eax                     \n\t"
         "movl "RANGE    "(%2), %%ebx            \n\t"
@@ -523,7 +523,7 @@
     int bit, lps_mask attribute_unused;
 
     c->range -= RangeLPS;
-#ifndef BRANCHLESS_CABAD
+#ifndef BRANCHLESS_CABAC_DECODER
     if(c->low < c->range){
         bit= s&1;
         *state= c->mps_state[s];