[FFmpeg-cvslog] cabac: drop unused STRICT_LIMITS code branch

Diego Biurrun git at videolan.org
Thu Jan 5 02:18:51 CET 2012


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Dec 27 12:25:18 2011 +0100| [e451c26c5f0bff9ced74ff6dfa3fce111fed1dbb] | committer: Diego Biurrun

cabac: drop unused STRICT_LIMITS code branch

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e451c26c5f0bff9ced74ff6dfa3fce111fed1dbb
---

 libavcodec/cabac.c |   16 ----------------
 libavcodec/cabac.h |    3 ---
 2 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index 57ab395..25713ee 100644
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -109,10 +109,6 @@ void ff_init_cabac_encoder(CABACContext *c, uint8_t *buf, int buf_size){
     c->low= 0;
     c->range= 0x1FE;
     c->outstanding_count= 0;
-#ifdef STRICT_LIMITS
-    c->sym_count =0;
-#endif
-
     c->pb.bit_left++; //avoids firstBitFlag
 }
 
@@ -179,10 +175,6 @@ static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
     }
 
     renorm_cabac_encoder(c);
-
-#ifdef STRICT_LIMITS
-    c->symCount++;
-#endif
 }
 
 /**
@@ -204,10 +196,6 @@ static void put_cabac_bypass(CABACContext *c, int bit){
         put_cabac_bit(c, 1);
         c->low -= 0x400;
     }
-
-#ifdef STRICT_LIMITS
-    c->symCount++;
-#endif
 }
 
 /**
@@ -232,10 +220,6 @@ static int put_cabac_terminate(CABACContext *c, int bit){
         flush_put_bits(&c->pb); //FIXME FIXME FIXME XXX wrong
     }
 
-#ifdef STRICT_LIMITS
-    c->symCount++;
-#endif
-
     return (put_bits_count(&c->pb)+7)>>3;
 }
 
diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index 1260642..b3f8f55 100644
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -41,9 +41,6 @@ typedef struct CABACContext{
     int low;
     int range;
     int outstanding_count;
-#ifdef STRICT_LIMITS
-    int symCount;
-#endif
     const uint8_t *bytestream_start;
     const uint8_t *bytestream;
     const uint8_t *bytestream_end;



More information about the ffmpeg-cvslog mailing list