diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-15 19:22:09 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-15 19:22:09 +0000 |
| commit | cf55f59d5ecb11dd404a11418055a0b6c704226e (patch) | |
| tree | 9badc064c30c4956bdeecc6b1c6514ef4a4b0421 /libavcodec/h264_cabac.c | |
| parent | f4060611e922108387bd7878780758be19644b8d (diff) | |
| download | ffmpeg-cf55f59d5ecb11dd404a11418055a0b6c704226e.tar.gz | |
Simplify decode_cabac_mb_intra4x4_pred_mode().
same speed
Originally committed as revision 21839 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264_cabac.c')
| -rw-r--r-- | libavcodec/h264_cabac.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 76fff719fd..7a37df5607 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -796,10 +796,7 @@ static int decode_cabac_mb_intra4x4_pred_mode( H264Context *h, int pred_mode ) { 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 - return mode; + return mode + ( mode >= pred_mode ); } static int decode_cabac_mb_chroma_pre_mode( H264Context *h) { |