X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcabac.h;h=d7f58d72848f7ef1ae5e254d19c637d4f5f8555c;hb=1a625dce18cee97974ef19f16f9e14a6cb795502;hp=bb682d9498c51ee95db3622dba9a44d425e28533;hpb=b1ef3dfd2ba4abbdf8e0dfafa5b10df9ead8a3c2;p=ffmpeg

diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index bb682d9498c..d7f58d72848 100644
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -24,8 +24,8 @@
  * Context Adaptive Binary Arithmetic Coder.
  */
 
-#ifndef CABAC_H
-#define CABAC_H
+#ifndef FFMPEG_CABAC_H
+#define FFMPEG_CABAC_H
 
 #include "bitstream.h"
 
@@ -90,6 +90,7 @@ static inline void renorm_cabac_encoder(CABACContext *c){
     }
 }
 
+#if 0
 static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
     int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + *state];
 
@@ -259,6 +260,7 @@ static void put_cabac_ueg(CABACContext *c, uint8_t * state, int v, int max, int
             put_cabac_bypass(c, sign);
     }
 }
+#endif /* 0 */
 
 static void refill(CABACContext *c){
 #if CABAC_BITS == 16
@@ -270,6 +272,7 @@ static void refill(CABACContext *c){
     c->bytestream+= CABAC_BITS/8;
 }
 
+#if ! ( defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) )
 static void refill2(CABACContext *c){
     int i, x;
 
@@ -287,6 +290,7 @@ static void refill2(CABACContext *c){
     c->low += x<<i;
     c->bytestream+= CABAC_BITS/8;
 }
+#endif
 
 static inline void renorm_cabac_decoder(CABACContext *c){
     while(c->range < 0x100){
@@ -805,6 +809,7 @@ static int get_cabac_terminate(CABACContext *c){
     }
 }
 
+#if 0
 /**
  * Get (truncated) unary binarization.
  */
@@ -860,5 +865,6 @@ static int get_cabac_ueg(CABACContext *c, uint8_t * state, int max, int is_signe
     }else
         return i;
 }
+#endif /* 0 */
 
-#endif /* CABAC_H */
+#endif /* FFMPEG_CABAC_H */