1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Originally committed as revision 6594 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-10-08 21:26:08 +00:00
parent a10c779f76
commit 6ff042699f

View File

@ -266,7 +266,6 @@ static void refill(CABACContext *c){
c->bytestream+= CABAC_BITS/8; c->bytestream+= CABAC_BITS/8;
} }
#if 1 /* all use commented */
static void refill2(CABACContext *c){ static void refill2(CABACContext *c){
int i, x; int i, x;
@ -285,7 +284,6 @@ static void refill2(CABACContext *c){
c->low += x<<i; c->low += x<<i;
c->bytestream+= CABAC_BITS/8; c->bytestream+= CABAC_BITS/8;
} }
#endif
static inline void renorm_cabac_decoder(CABACContext *c){ static inline void renorm_cabac_decoder(CABACContext *c){
while(c->range < (0x200 << CABAC_BITS)){ while(c->range < (0x200 << CABAC_BITS)){
@ -398,8 +396,6 @@ asm(
bit= ff_h264_norm_shift[RangeLPS>>17]; bit= ff_h264_norm_shift[RangeLPS>>17];
c->low -= c->range; c->low -= c->range;
*state= c->lps_state[s]; *state= c->lps_state[s];
// c->range = RangeLPS;
// renorm_cabac_decoder(c);
c->range = RangeLPS<<bit; c->range = RangeLPS<<bit;
c->low <<= bit; c->low <<= bit;
bit= (s&1)^1; bit= (s&1)^1;