tidier cabac_intra4x4_pred_mode

Originally committed as revision 4673 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Loren Merritt 2005-11-03 23:26:51 +00:00
parent d4de20d11c
commit 1fd97d8c1a

View File

@ -5291,12 +5291,10 @@ static int decode_cabac_mb_intra4x4_pred_mode( H264Context *h, int pred_mode ) {
if( get_cabac( &h->cabac, &h->cabac_state[68] ) )
return pred_mode;
if( get_cabac( &h->cabac, &h->cabac_state[69] ) )
mode += 1;
if( get_cabac( &h->cabac, &h->cabac_state[69] ) )
mode += 2;
if( get_cabac( &h->cabac, &h->cabac_state[69] ) )
mode += 4;
mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] );
mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] );
mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] );
if( mode >= pred_mode )
return mode + 1;
else