Skip to content

F
ffmpeg-mt
Commit 58fab35c authored by lorenm's avatar lorenm
Browse files
Options

tidier cabac_intra4x4_pred_mode 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4673 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 66aa807d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
libavcodec/h264.c
View file @ 58fab35c
...@@ -5291,12 +5291,10 @@ static int decode_cabac_mb_intra4x4_pred_mode( H264Context *h, int pred_mode ) { ...@@ -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] ) ) if( get_cabac( &h->cabac, &h->cabac_state[68] ) )
return pred_mode; return pred_mode;
if( get_cabac( &h->cabac, &h->cabac_state[69] ) ) mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] );
mode += 1; mode += 2 * get_cabac( &h->cabac, &h->cabac_state[69] );
if( get_cabac( &h->cabac, &h->cabac_state[69] ) ) mode += 4 * get_cabac( &h->cabac, &h->cabac_state[69] );
mode += 2;
if( get_cabac( &h->cabac, &h->cabac_state[69] ) )
mode += 4;
if( mode >= pred_mode ) if( mode >= pred_mode )
return mode + 1; return mode + 1;
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment