# HG changeset patch
# User michael
# Date 1266261729 0
# Node ID 0c93bb2b3cb03c10b3b592c46ed47ebf2a9f42c3
# Parent  63f55748173c1f93941a9718e8a8cbf6b64453cc
Simplify decode_cabac_mb_intra4x4_pred_mode().
same speed

diff -r 63f55748173c -r 0c93bb2b3cb0 h264_cabac.c
--- a/h264_cabac.c	Mon Feb 15 19:20:49 2010 +0000
+++ b/h264_cabac.c	Mon Feb 15 19:22:09 2010 +0000
@@ -796,10 +796,7 @@
     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) {