Mercurial > libavcodec.hg
diff h264.c @ 3409:584ff6431043 libavcodec
simplify intra prediction mode decoding
author | michael |
---|---|
date | Tue, 04 Jul 2006 17:06:43 +0000 |
parents | 69901769c811 |
children | cc4b4ea83e29 |
line wrap: on
line diff
--- a/h264.c Tue Jul 04 16:42:22 2006 +0000 +++ b/h264.c Tue Jul 04 17:06:43 2006 +0000 @@ -5258,18 +5258,11 @@ // fill_intra4x4_pred_table(h); for(i=0; i<16; i+=di){ - const int mode_coded= !get_bits1(&s->gb); - const int predicted_mode= pred_intra_mode(h, i); - int mode; - - if(mode_coded){ + int mode= pred_intra_mode(h, i); + + if(!get_bits1(&s->gb)){ const int rem_mode= get_bits(&s->gb, 3); - if(rem_mode<predicted_mode) - mode= rem_mode; - else - mode= rem_mode + 1; - }else{ - mode= predicted_mode; + mode = rem_mode + (rem_mode >= mode); } if(di==4)