diff options
author | Ronald S. Bultje <rbultje@google.com> | 2013-02-26 19:39:28 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-02-26 19:39:28 -0800 |
commit | db54e6774f08bd00e1c8e164a7bfe5c29eccb566 (patch) | |
tree | 87086b19199f064410530769a0d814806edd6714 /vp9/encoder | |
parent | 4446af78f0f7881fbc8815aefebf3ab757c74d26 (diff) | |
parent | 71539eae2a334ee8cf002bc2a951033e7ac378f9 (diff) | |
download | libvpx-db54e6774f08bd00e1c8e164a7bfe5c29eccb566.tar libvpx-db54e6774f08bd00e1c8e164a7bfe5c29eccb566.tar.gz libvpx-db54e6774f08bd00e1c8e164a7bfe5c29eccb566.tar.bz2 libvpx-db54e6774f08bd00e1c8e164a7bfe5c29eccb566.zip |
Merge "Minor cosmetics in rdopt." into experimental
Diffstat (limited to 'vp9/encoder')
-rw-r--r-- | vp9/encoder/vp9_rdopt.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 6e1122f3e..d0f436229 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -449,12 +449,10 @@ static INLINE int cost_coeffs(MACROBLOCK *mb, seg_eob = 1024; qcoeff_ptr = xd->sb_coeff_data.qcoeff; #if CONFIG_CNVCONTEXT - a_ec = a[0] + a[1] + a[2] + a[3] + - a1[0] + a1[1] + a1[2] + a1[3]; - l_ec = l[0] + l[1] + l[2] + l[3] + - l1[0] + l1[1] + l1[2] + l1[3]; - a_ec = a_ec != 0; - l_ec = l_ec != 0; + a_ec = (a[0] + a[1] + a[2] + a[3] + + a1[0] + a1[1] + a1[2] + a1[3]) != 0; + l_ec = (l[0] + l[1] + l[2] + l[3] + + l1[0] + l1[1] + l1[2] + l1[3]) != 0; #endif break; default: |