# HG changeset patch # User lorenm # Date 1131060411 0 # Node ID 16d67170715cae3c9ef7235b25890e7a94da9518 # Parent d268a7c6c91dee9caed5f6d14e3f0445d7653dfa tidier cabac_intra4x4_pred_mode diff -r d268a7c6c91d -r 16d67170715c h264.c --- a/h264.c Wed Nov 02 09:18:32 2005 +0000 +++ b/h264.c Thu Nov 03 23:26:51 2005 +0000 @@ -5291,12 +5291,10 @@ if( get_cabac( &h->cabac, &h->cabac_state[68] ) ) return pred_mode; - if( get_cabac( &h->cabac, &h->cabac_state[69] ) ) - mode += 1; - if( get_cabac( &h->cabac, &h->cabac_state[69] ) ) - mode += 2; - if( get_cabac( &h->cabac, &h->cabac_state[69] ) ) - mode += 4; + mode += 1 * get_cabac( &h->cabac, &h->cabac_state[69] ); + 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