comparison h264.c @ 4344:4aa24216f71a libavcodec

fix 16 CABAC_BIT * 10l bug introduced in r6578
author michael
date Sat, 13 Jan 2007 00:56:43 +0000
parents d6f83e2f8804
children d18568fb0187
comparison
equal deleted inserted replaced
4343:d9a61f401c11 4344:4aa24216f71a
6222 6222
6223 // We assume these blocks are very rare so we dont optimize it. 6223 // We assume these blocks are very rare so we dont optimize it.
6224 // FIXME The two following lines get the bitstream position in the cabac 6224 // FIXME The two following lines get the bitstream position in the cabac
6225 // decode, I think it should be done by a function in cabac.h (or cabac.c). 6225 // decode, I think it should be done by a function in cabac.h (or cabac.c).
6226 ptr= h->cabac.bytestream; 6226 ptr= h->cabac.bytestream;
6227 if (h->cabac.low&0x1) ptr-=CABAC_BITS/8; 6227 if(h->cabac.low&0x1) ptr--;
6228 if(CABAC_BITS==16){
6229 if(h->cabac.low&0x1FF) ptr--;
6230 }
6228 6231
6229 // The pixels are stored in the same order as levels in h->mb array. 6232 // The pixels are stored in the same order as levels in h->mb array.
6230 for(y=0; y<16; y++){ 6233 for(y=0; y<16; y++){
6231 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3); 6234 const int index= 4*(y&3) + 32*((y>>2)&1) + 128*(y>>3);
6232 for(x=0; x<16; x++){ 6235 for(x=0; x<16; x++){