Skip to content

F
ffmpeg
Commit 0a60780c authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c.

parent 64d779f2
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
libavcodec/cabac.c
View file @ 0a60780c
...@@ -51,7 +51,7 @@ static const uint8_t lps_range[64][4]= { ...@@ -51,7 +51,7 @@ static const uint8_t lps_range[64][4]= {
uint8_t ff_h264_mlps_state[4*64]; uint8_t ff_h264_mlps_state[4*64];
uint8_t ff_h264_lps_range[4*2*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]= { static const uint8_t mps_state[64]= {
1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8,
...@@ -140,9 +140,9 @@ void ff_init_cabac_states(CABACContext *c){ ...@@ -140,9 +140,9 @@ void ff_init_cabac_states(CABACContext *c){
} }
ff_h264_mlps_state[128+2*i+0]= 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_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 ){ if( i ){
ff_h264_mlps_state[128-2*i-1]= 2*lps_state[i]+0; 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){ ...@@ -191,7 +191,7 @@ static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
if(bit == ((*state)&1)){ if(bit == ((*state)&1)){
c->range -= RangeLPS; c->range -= RangeLPS;
*state= ff_h264_mps_state[*state]; *state = h264_mps_state[*state];
}else{ }else{
c->low += c->range - RangeLPS; c->low += c->range - RangeLPS;
c->range = RangeLPS; c->range = RangeLPS;
......
libavcodec/cabac.h
View file @ 0a60780c
...@@ -49,7 +49,6 @@ typedef struct CABACContext{ ...@@ -49,7 +49,6 @@ typedef struct CABACContext{
extern uint8_t ff_h264_mlps_state[4*64]; 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_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]; extern const uint8_t ff_h264_norm_shift[512];
#if ARCH_X86 #if ARCH_X86
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment