diff options
| author | Jingning Han <jingning@google.com> | 2015-01-30 15:49:14 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-01-30 15:49:14 -0800 |
| commit | f1ab5c1021eb852cb9fecc22ded2548dee5c6a3a (patch) | |
| tree | b156f8577c20338d2abe2a2ab94f371a9ec36ce4 /vp9 | |
| parent | d2493313aeefadd6a6cf7bd4c0d36cc1a3e24b3d (diff) | |
| parent | 9bdc0ae2b2ea29f3d4d90861122dabd6146a5419 (diff) | |
| download | libvpx-f1ab5c1021eb852cb9fecc22ded2548dee5c6a3a.tar libvpx-f1ab5c1021eb852cb9fecc22ded2548dee5c6a3a.tar.gz libvpx-f1ab5c1021eb852cb9fecc22ded2548dee5c6a3a.tar.bz2 libvpx-f1ab5c1021eb852cb9fecc22ded2548dee5c6a3a.zip | |
Merge "Format fixes in vp9_rd_pick_inter_mode_sb/sub8x8"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index a183fdc69..55f1e3675 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3047,8 +3047,8 @@ void vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, } } - if (ref_frame_skip_mask[0] & (1 << ref_frame) && - ref_frame_skip_mask[1] & (1 << MAX(0, second_ref_frame))) + if ((ref_frame_skip_mask[0] & (1 << ref_frame)) && + (ref_frame_skip_mask[1] & (1 << MAX(0, second_ref_frame)))) continue; if (mode_skip_mask[ref_frame] & (1 << this_mode)) @@ -3750,8 +3750,8 @@ void vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, } } - if (ref_frame_skip_mask[0] & (1 << ref_frame) && - ref_frame_skip_mask[1] & (1 << MAX(0, second_ref_frame))) + if ((ref_frame_skip_mask[0] & (1 << ref_frame)) && + (ref_frame_skip_mask[1] & (1 << MAX(0, second_ref_frame)))) continue; // Test best rd so far against threshold for trying this mode. |