diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-01-12 21:35:34 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-01-12 22:57:42 +0100 |
| commit | 0a60780c7fe72e2f9cc41efc152b3807954b7820 (patch) | |
| tree | 8ec10243a2de713c359fdffa3bf3dcbaa46c0d3c | |
| parent | 64d779f2f7607070a87b0a70edeba5e51834ce85 (diff) | |
| download | ffmpeg-0a60780c7fe72e2f9cc41efc152b3807954b7820.tar.gz | |
cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c.
| -rw-r--r-- | libavcodec/cabac.c | 8 | ||||
| -rw-r--r-- | libavcodec/cabac.h | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c index 1de45841ea..11971f5984 100644 --- a/libavcodec/cabac.c +++ b/libavcodec/cabac.c @@ -51,7 +51,7 @@ static const uint8_t lps_range[64][4]= { uint8_t ff_h264_mlps_state[4*64]; uint8_t ff_h264_lps_range[4*2*64]; -uint8_t ff_h264_mps_state[2*64]; +static uint8_t h264_mps_state[2 * 64]; static const uint8_t mps_state[64]= { 1, 2, 3, 4, 5, 6, 7, 8, @@ -140,9 +140,9 @@ void ff_init_cabac_states(CABACContext *c){ } ff_h264_mlps_state[128+2*i+0]= - ff_h264_mps_state[2*i+0]= 2*mps_state[i]+0; + h264_mps_state[2 * i + 0] = 2 * mps_state[i] + 0; ff_h264_mlps_state[128+2*i+1]= - ff_h264_mps_state[2*i+1]= 2*mps_state[i]+1; + h264_mps_state[2 * i + 1] = 2 * mps_state[i] + 1; if( i ){ ff_h264_mlps_state[128-2*i-1]= 2*lps_state[i]+0; @@ -191,7 +191,7 @@ static void put_cabac(CABACContext *c, uint8_t * const state, int bit){ if(bit == ((*state)&1)){ c->range -= RangeLPS; - *state= ff_h264_mps_state[*state]; + *state = h264_mps_state[*state]; }else{ c->low += c->range - RangeLPS; c->range = RangeLPS; diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h index f7d169ac11..ab835f921f 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -49,7 +49,6 @@ typedef struct CABACContext{ extern uint8_t ff_h264_mlps_state[4*64]; extern uint8_t ff_h264_lps_range[4*2*64]; ///< rangeTabLPS -extern uint8_t ff_h264_mps_state[2*64]; ///< transIdxMPS extern const uint8_t ff_h264_norm_shift[512]; #if ARCH_X86 |