ref: a19638ac40e44c36afb71ff541c3840ca4b6d70c
parent: 36b998f2eb5ba0870ea36d3929be1f5f5f729d15
parent: d32c38afbf42b892744d50386e47ae84c52ccfad
author: Jerome Jiang <jianj@google.com>
date: Sat May 12 02:08:16 EDT 2018
Merge "Fix valgrind failure on uninitialized values."
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1771,6 +1771,8 @@
sse_zeromv_normalized < thresh_svc_skip_golden)
continue;
+ if (!(cpi->ref_frame_flags & flag_list[ref_frame])) continue;
+
if (sf->short_circuit_flat_blocks && x->source_variance == 0 &&
frame_mv[this_mode][ref_frame].as_int != 0) {
continue;
@@ -1801,8 +1803,6 @@
frame_mv[this_mode][ref_frame].as_int != 0)
continue;
}
-
- if (!(cpi->ref_frame_flags & flag_list[ref_frame])) continue;
if (const_motion[ref_frame] && this_mode == NEARMV) continue;