From 92ed1ec957951068b7daac38997af81bd855d06e Mon Sep 17 00:00:00 2001 From: Alexander Strange Date: Wed, 2 Jul 2008 22:25:17 +0000 Subject: Use get_cabac_bypass_sign instead of an if/else. Originally committed as revision 14054 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 561d68ea5f..26dcd90ab5 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -5549,11 +5549,9 @@ static av_always_inline void decode_cabac_residual_internal( H264Context *h, DCT } 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; } } } -- cgit v1.2.3