BRANCHLESS_CABAD --> BRANCHLESS_CABAC_DECODER

Originally committed as revision 6623 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index 01efcdb..f2744a3 100644 (file)
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -133,7 +133,7 @@ void ff_init_cabac_states(CABACContext *c, uint8_t const (*lps_range)[4],
         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 --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index d1022a9..a677d0f 100644 (file)
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -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 @@ static int get_cabac(CABACContext *c, uint8_t * const state){
 #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 @@ static int get_cabac(CABACContext *c, uint8_t * const state){
     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];