From cf55f59d5ecb11dd404a11418055a0b6c704226e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 15 Feb 2010 19:22:09 +0000 Subject: Simplify decode_cabac_mb_intra4x4_pred_mode(). same speed Originally committed as revision 21839 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264_cabac.c | 5 +---- 1 file changed, 1 insertion(+), 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) { -- cgit v1.2.3