Mercurial > libavcodec.hg
comparison dv.c @ 9741:e52891e48ceb libavcodec
remove cast and use put_sbits, fix assertion in put_bits
author | bcoudurier |
---|---|
date | Sun, 31 May 2009 06:33:58 +0000 |
parents | bd3e11b60ccd |
children | 756ac43c7fd9 |
comparison
equal
deleted
inserted
replaced
9740:30b00f4bdeb1 | 9741:e52891e48ceb |
---|---|
1075 /* First pass over individual cells only */ | 1075 /* First pass over individual cells only */ |
1076 for (i=0; i<s->sys->bpm; i++, j++) { | 1076 for (i=0; i<s->sys->bpm; i++, j++) { |
1077 int sz = s->sys->block_sizes[i]>>3; | 1077 int sz = s->sys->block_sizes[i]>>3; |
1078 | 1078 |
1079 init_put_bits(&pbs[j], dif, sz); | 1079 init_put_bits(&pbs[j], dif, sz); |
1080 put_bits(&pbs[j], 9, (uint16_t)(((enc_blks[j].mb[0] >> 3) - 1024 + 2) >> 2)); | 1080 put_sbits(&pbs[j], 9, ((enc_blks[j].mb[0] >> 3) - 1024 + 2) >> 2); |
1081 put_bits(&pbs[j], 1, enc_blks[j].dct_mode); | 1081 put_bits(&pbs[j], 1, enc_blks[j].dct_mode); |
1082 put_bits(&pbs[j], 2, enc_blks[j].cno); | 1082 put_bits(&pbs[j], 2, enc_blks[j].cno); |
1083 | 1083 |
1084 dv_encode_ac(&enc_blks[j], &pbs[j], &pbs[j+1]); | 1084 dv_encode_ac(&enc_blks[j], &pbs[j], &pbs[j+1]); |
1085 dif += sz; | 1085 dif += sz; |