comparison cabac.h @ 2522:e25782262d7d libavcodec

kill warnings patch by (Mns Rullgrd <mru inprovide com>)
author michael
date Thu, 24 Feb 2005 19:08:50 +0000
parents 1c39d9786efd
children aaa8b65d1253
comparison
equal deleted inserted replaced
2521:d3885f927bc7 2522:e25782262d7d
262 #endif 262 #endif
263 c->low -= CABAC_MASK; 263 c->low -= CABAC_MASK;
264 c->bytestream+= CABAC_BITS/8; 264 c->bytestream+= CABAC_BITS/8;
265 } 265 }
266 266
267 #if 0 /* all use commented */
267 static void refill2(CABACContext *c){ 268 static void refill2(CABACContext *c){
268 int i, x; 269 int i, x;
269 270
270 x= c->low ^ (c->low-1); 271 x= c->low ^ (c->low-1);
271 i= 8 - ff_h264_norm_shift[x>>(CABAC_BITS+1)]; 272 i= 8 - ff_h264_norm_shift[x>>(CABAC_BITS+1)];
280 #endif 281 #endif
281 282
282 c->low += x<<i; 283 c->low += x<<i;
283 c->bytestream+= CABAC_BITS/8; 284 c->bytestream+= CABAC_BITS/8;
284 } 285 }
285 286 #endif
286 287
287 static inline void renorm_cabac_decoder(CABACContext *c){ 288 static inline void renorm_cabac_decoder(CABACContext *c){
288 while(c->range < (0x200 << CABAC_BITS)){ 289 while(c->range < (0x200 << CABAC_BITS)){
289 c->range+= c->range; 290 c->range+= c->range;
290 c->low+= c->low; 291 c->low+= c->low;
301 refill(c); 302 refill(c);
302 } 303 }
303 304
304 static inline int get_cabac(CABACContext *c, uint8_t * const state){ 305 static inline int get_cabac(CABACContext *c, uint8_t * const state){
305 int RangeLPS= c->lps_range[*state][c->range>>(CABAC_BITS+7)]<<(CABAC_BITS+1); 306 int RangeLPS= c->lps_range[*state][c->range>>(CABAC_BITS+7)]<<(CABAC_BITS+1);
306 int bit, lps_mask; 307 int bit, lps_mask attribute_unused;
307 308
308 c->range -= RangeLPS; 309 c->range -= RangeLPS;
309 #if 1 310 #if 1
310 if(c->low < c->range){ 311 if(c->low < c->range){
311 bit= (*state)&1; 312 bit= (*state)&1;