X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fcabac.c;h=f69b100d604a6e779822d5d254433712e81578f9;hp=52e6c50e47a09ccfb4b1f655d3116337d5f3584a;hb=2e1aee80f4e7bd17bfcc5a386f5b879f9e2437bc;hpb=b420448e38ae27110953e857f5d65b58ccc8e688 diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c index 52e6c50e47..f69b100d60 100644 --- a/libavcodec/cabac.c +++ b/libavcodec/cabac.c @@ -133,11 +133,19 @@ void ff_init_cabac_states(CABACContext *c, uint8_t const (*lps_range)[4], c->mps_state[2*i+3]= 2*mps_state[i]+3; if( i ){ +#ifdef BRANCHLESS_CABAD + c->mps_state[-2*i-3]= 2*lps_state[i]+2; //FIXME yes this is not valid C but iam lazy, cleanup welcome + c->mps_state[-2*i-4]= 2*lps_state[i]+3; + }else{ + c->mps_state[-2*i-3]= 3; + c->mps_state[-2*i-4]= 2; +#else c->lps_state[2*i+2]= 2*lps_state[i]+2; c->lps_state[2*i+3]= 2*lps_state[i]+3; }else{ c->lps_state[2*i+2]= 3; c->lps_state[2*i+3]= 2; +#endif } } }