Browse Source

tidier cabac_intra4x4_pred_mode

Originally committed as revision 4673 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Loren Merritt 20 years ago
parent
commit
1fd97d8c1a
1 changed files with 4 additions and 6 deletions
  1. +4
    -6
      libavcodec/h264.c

+ 4
- 6
libavcodec/h264.c 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


Loading…
Cancel
Save