commit 1832ba7509b0bb42143c2bb4101a6c8a90796774
author Yaowu Xu <yaowu@google.com> Thu Oct 15 11:33:41 2015 -0700
committer Yaowu Xu <yaowu@google.com> Fri Oct 16 00:28:37 2015 +0000
tree 92e37e91cc6f021175f7ae4de01912975620b526
parent aaf6f6215fc6cf9996895f663b847e01667f9d57

Restore partial changes from previous commit

This portion was tested to have no effect on asan test failures.

Change-Id: I3de1dab7479148bdffc24c4568cb2e7e9963f099

vp9/encoder/vp9_encodeframe.c

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 9a63981..2333a13 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2422,7 +2422,8 @@
     do_split &= bsize > min_size;
   }
 
-  if (cpi->sf.use_square_partition_only) {
+  if (cpi->sf.use_square_partition_only &&
+      bsize > cpi->sf.use_square_only_threshold) {
       partition_horz_allowed &= force_horz_split;
       partition_vert_allowed &= force_vert_split;
   }