diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2005-11-03 23:26:51 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2005-11-03 23:26:51 +0000 |
| commit | 1fd97d8c1aba061d03caa3d02ec31ee2ef5b6073 (patch) | |
| tree | 6f522fec46a7e101b7be1e33c11989227ff26363 /libavcodec/h264.c | |
| parent | d4de20d11c57c5e79bd67369936135f9f32a9cd6 (diff) | |
| download | ffmpeg-1fd97d8c1aba061d03caa3d02ec31ee2ef5b6073.tar.gz | |
tidier cabac_intra4x4_pred_mode
Originally committed as revision 4673 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c0129e2904..b979f36638 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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 |