Mercurial > libavcodec.hg

diff cabac.h @ 3984:bb186452e7da libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BRANCHLESS_CABAD --> BRANCHLESS_CABAC_DECODER
author diego
date Tue, 10 Oct 2006 08:16:41 +0000
parents af16271634c2
children 746a60ba3177
line wrap: on
line diff
--- 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];