cosmetics: merge some duplicate tables

[x264] / common / cabac.h

diff --git a/common/cabac.h b/common/cabac.h
index 945fb17a9587d0f251212244ce07b84f15eedc54..251922d2e5ce19acb927d52a9f6e17df391565d5 100644 (file)
--- a/common/cabac.h
+++ b/common/cabac.h
@@ -46,8 +46,6 @@ typedef struct
     int i_low;
     int i_range;
 
-    int i_sym_cnt;
-
     /* bit stream */
     int b_first_bit;
     int i_bits_outstanding;
@@ -75,5 +73,9 @@ void x264_cabac_encode_bypass( x264_cabac_t *cb, int b );
 void x264_cabac_encode_terminal( x264_cabac_t *cb, int b );
 void x264_cabac_encode_flush( x264_cabac_t *cb );
 
+static inline int x264_cabac_pos( x264_cabac_t *cb )
+{
+    return bs_pos( cb->s ) + cb->i_bits_outstanding;
+}
 
 #endif