ref: f1ab5c1021eb852cb9fecc22ded2548dee5c6a3a
parent: d2493313aeefadd6a6cf7bd4c0d36cc1a3e24b3d
parent: 9bdc0ae2b2ea29f3d4d90861122dabd6146a5419
author: Jingning Han <jingning@google.com>
date: Fri Jan 30 10:49:14 EST 2015
Merge "Format fixes in vp9_rd_pick_inter_mode_sb/sub8x8"
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -3047,8 +3047,8 @@
}
}
- 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 @@
}
}
- 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.