[FFmpeg-cvslog] r21839 - trunk/libavcodec/h264_cabac.c

[michael]

Author: michael
Date: Mon Feb 15 20:22:09 2010
New Revision: 21839

Log:
Simplify decode_cabac_mb_intra4x4_pred_mode().
same speed

Modified:
   trunk/libavcodec/h264_cabac.c

Modified: trunk/libavcodec/h264_cabac.c
==============================================================================
--- trunk/libavcodec/h264_cabac.c	Mon Feb 15 20:20:49 2010	(r21838)
+++ trunk/libavcodec/h264_cabac.c	Mon Feb 15 20:22:09 2010	(r21839)
@@ -796,10 +796,7 @@ static int decode_cabac_mb_intra4x4_pred
     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) {