[FFmpeg-cvslog] r14054 - trunk/libavcodec/h264.c

[astrange]

Author: astrange
Date: Thu Jul  3 00:25:17 2008
New Revision: 14054

Log:
Use get_cabac_bypass_sign instead of an if/else.


Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Thu Jul  3 00:25:17 2008
@@ -5549,11 +5549,9 @@ static av_always_inline void decode_caba
             }
 
             if( is_dc ) {
-                if( get_cabac_bypass( CC ) ) block[j] = -coeff_abs;
-                else                                block[j] =  coeff_abs;
+                block[j] = get_cabac_bypass_sign( CC, -coeff_abs );
             }else{
-                if( get_cabac_bypass( CC ) ) block[j] = (-coeff_abs * qmul[j] + 32) >> 6;
-                else                                block[j] = ( coeff_abs * qmul[j] + 32) >> 6;
+                block[j] = (get_cabac_bypass_sign( CC, -coeff_abs ) * qmul[j] + 32) >> 6;
             }
         }
     }