Use get_cabac_bypass_sign instead of an if/else.

Originally committed as revision 14054 to svn://svn.ffmpeg.org/ffmpeg/trunk

Use get_cabac_bypass_sign instead of an if/else.
Originally committed as revision 14054 to svn://svn.ffmpeg.org/ffmpeg/trunk
92ed1ec9 · Alexander Strange · 142ee5d7 · 92ed1ec9
Commit 92ed1ec9 authored Jul 02, 2008 by Alexander Strange
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

h264.c libavcodec/h264.c +2 -4

No files found.
--- 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;
            }
        }
    }