From 2b30f33e2dcbc2eea37201f69e05ab6445359bd1 Mon Sep 17 00:00:00 2001
From: Hui Su <huisu@google.com>
Date: Wed, 5 Sep 2018 13:00:56 -0700
Subject: [PATCH] Initialize the best partition before partition RDO

This fixes the multi-thread encoder test failure.

Change-Id: I0c1845922068e71097a387db0969ca419accb3ed
---
 vp9/encoder/vp9_encodeframe.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 8bba7d98a..088e42381 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -4448,6 +4448,8 @@ static void rd_pick_partition(VP9_COMP *cpi, ThreadData *td,
   }
 #endif
 
+  pc_tree->partitioning = PARTITION_NONE;
+
   // PARTITION_NONE
   if (partition_none_allowed) {
     rd_pick_sb_modes(cpi, tile_data, x, mi_row, mi_col, &this_rdc, bsize, ctx,
-- 
2.50.1