commit 81056e2d5e8d8efd2fa92fd2fdbd706e3482ed5d
author Yunqing Wang <yunqingwang@google.com> Thu Apr 10 08:25:10 2014 -0700
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Thu Apr 10 08:25:10 2014 -0700
tree 6d7a89344a3f89ecac4839cddeffe323055f5a0d
parent 65e650e0c0b030ce3cab880ef5b189e337a689ac
parent 7c891ed2e00a85c47d88fed8e19a4007cb6829c4

Merge "Minor code cleanup"

vp9/encoder/vp9_encodeframe.c

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 311854b..c52e4f3 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -3284,9 +3284,9 @@
     }
     vp9_zero(x->zcoeff_blk);
 
-    if (cpi->sf.partition_search_type == SOURCE_VAR_BASED_PARTITION &&
+    if (sf->partition_search_type == SOURCE_VAR_BASED_PARTITION &&
         cm->current_video_frame > 0) {
-      int check_freq = cpi->sf.search_type_check_frequency;
+      int check_freq = sf->search_type_check_frequency;
 
       if ((cm->current_video_frame - 1) % check_freq == 0) {
         cpi->use_large_partition_rate = 0;
@@ -3303,7 +3303,7 @@
 
       if ((cm->current_video_frame - 1) % check_freq >= 1) {
         if (cpi->use_large_partition_rate < 15)
-          cpi->sf.partition_search_type = FIXED_PARTITION;
+          sf->partition_search_type = FIXED_PARTITION;
       }
     }
   }