commit 4be3214fecf0cf371183ab755bc2892f26ae565d
author Jingning Han <jingning@google.com> Fri Nov 04 17:53:53 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 04 17:53:53 2016 +0000
tree 059d6905267a958c2621fd835ecbf4281602849a
parent 95a3898cbdb71b9a322dc8c4e3e395d22eeb6bdf
parent 98d6a1f2473d716eb85de3b778856a59be7c1bd0

Merge "Properly schedule the transform block recursion order" into nextgenv2

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 217a365..2e4c5f2 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -7569,8 +7569,8 @@
 #if CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
         continue;
 #else
-      restore_dst_buf(xd, orig_dst, orig_dst_stride);
-      return INT64_MAX;
+        restore_dst_buf(xd, orig_dst, orig_dst_stride);
+        return INT64_MAX;
 #endif  // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
       }
 
@@ -9560,9 +9560,6 @@
         best_mbmode.mode = ZEROMV;
 #if CONFIG_EXT_INTER
     } else {
-      const MV_REFERENCE_FRAME refs[2] = { best_mbmode.ref_frame[0],
-                                           best_mbmode.ref_frame[1] };
-
       if (frame_mv[NEAREST_NEARESTMV][refs[0]].as_int ==
               best_mbmode.mv[0].as_int &&
           frame_mv[NEAREST_NEARESTMV][refs[1]].as_int ==