Mercurial > libavcodec.hg

comparison h264.c @ 10535:95f3daa991a2 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use get_bits_left() instead of size_in_bits - get_bits_count().
author rbultje
date Mon, 16 Nov 2009 17:42:43 +0000
parents 6fe84da648e2
children d126f819ea24
comparison
equal deleted inserted replaced
10534:4cd2ef16fb63 10535:95f3daa991a2
6690 6690
6691 /* init cabac */ 6691 /* init cabac */
6692 ff_init_cabac_states( &h->cabac); 6692 ff_init_cabac_states( &h->cabac);
6693 ff_init_cabac_decoder( &h->cabac, 6693 ff_init_cabac_decoder( &h->cabac,
6694 s->gb.buffer + get_bits_count(&s->gb)/8, 6694 s->gb.buffer + get_bits_count(&s->gb)/8,
6695 ( s->gb.size_in_bits - get_bits_count(&s->gb) + 7)/8); 6695 (get_bits_left(&s->gb) + 7)/8);
6696 /* calculate pre-state */ 6696 /* calculate pre-state */
6697 for( i= 0; i < 460; i++ ) { 6697 for( i= 0; i < 460; i++ ) {
6698 int pre; 6698 int pre;
6699 if( h->slice_type_nos == FF_I_TYPE ) 6699 if( h->slice_type_nos == FF_I_TYPE )
6700 pre = av_clip( ((cabac_context_init_I[i][0] * s->qscale) >>4 ) + cabac_context_init_I[i][1], 1, 126 ); 6700 pre = av_clip( ((cabac_context_init_I[i][0] * s->qscale) >>4 ) + cabac_context_init_I[i][1], 1, 126 );