commit c1c6f6a2dde99d6ea90c34e2e2f1c28e98976f98
author Yaowu Xu <yaowu@google.com> Tue Nov 08 11:24:01 2016 -0800
committer Yaowu Xu <yaowu@google.com> Tue Nov 08 11:31:16 2016 -0800
tree f06404f4e84c1384dfffdc640957c3a2600471d2
parent 6515afc6b90751d86b3e2f77336cd374d80896d7
parent 8b0f636831d18ed770fc9b2fbd9098cbb616251e

Merge aom/master and webm/nextgenv2

Change-Id: Ic9679c0551f809807bd5c1196c302b072e7fa613

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 7daa992..5c3b8fb 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -7854,7 +7854,7 @@
 
       rdcosty = RDCOST(x->rdmult, x->rddiv, *rate2, *distortion);
       rdcosty = AOMMIN(rdcosty, RDCOST(x->rdmult, x->rddiv, 0, *psse));
-
+/* clang-format off */
 #if CONFIG_VAR_TX
       is_cost_valid_uv =
           inter_block_uvrd(cpi, x, &rd_stats_uv, bsize, ref_best_rd - rdcosty);
@@ -7881,7 +7881,7 @@
         return INT64_MAX;
 #endif  // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
       }
-
+      /* clang-format on */
       *psse += sseuv;
       *rate2 += *rate_uv;
       *distortion += distortion_uv;