remove cast and use put_sbits, fix assertion in put_bits

Originally committed as revision 19024 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-05-31 06:33:58 +00:00
parent 15c315b7f1
commit b8df8d0d1c

View File

@ -1077,7 +1077,7 @@ static int dv_encode_video_segment(AVCodecContext *avctx, void *arg)
int sz = s->sys->block_sizes[i]>>3;
init_put_bits(&pbs[j], dif, sz);
put_bits(&pbs[j], 9, (uint16_t)(((enc_blks[j].mb[0] >> 3) - 1024 + 2) >> 2));
put_sbits(&pbs[j], 9, ((enc_blks[j].mb[0] >> 3) - 1024 + 2) >> 2);
put_bits(&pbs[j], 1, enc_blks[j].dct_mode);
put_bits(&pbs[j], 2, enc_blks[j].cno);