Mercurial > libavcodec.hg

changeset 11182:0c93bb2b3cb0 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify decode_cabac_mb_intra4x4_pred_mode(). same speed
author michael
date Mon, 15 Feb 2010 19:22:09 +0000
parents 63f55748173c
children d1a855cb0a0c
files h264_cabac.c
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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) {