commit d16d8ee250b7b0f8159ac8ce119958bef8ffd21e
author Rupert Swarbrick <rupert.swarbrick@argondesign.com> Tue Dec 12 11:55:39 2017 +0000
committer Rupert Swarbrick <rupert.swarbrick@argondesign.com> Tue Dec 19 10:39:41 2017 +0000
tree aa07b33ac0bbe53cdc1589cf3b99117654ecf80f
parent a84faf234dc5bd5c43744085bd65d0b8dd38df1b

Match braces in rdopt.c

This makes motion by function easier in some editors (such as Emacs or
vi), which get a bit confused by

  #if 1
  foo {
  #else
  foo {
  #endif
    bar;
  }

Change-Id: Ie9d8c34d3b9fafdac634db5f3647f3cc1611ebee

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index ef31654..ac3a6d9 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -6454,10 +6454,12 @@
     x->best_mv.as_mv.row *= 8;
     x->best_mv.as_mv.col *= 8;
   }
-  if (bestsme < INT_MAX && cpi->common.cur_frame_force_integer_mv == 0) {
+  const int use_fractional_mv =
+      bestsme < INT_MAX && cpi->common.cur_frame_force_integer_mv == 0;
 #else
-  if (bestsme < INT_MAX) {
+  const int use_fractional_mv = bestsme < INT_MAX;
 #endif
+  if (use_fractional_mv) {
     int dis; /* TODO: use dis in distortion calculation later. */
     switch (mbmi->motion_mode) {
       case SIMPLE_TRANSLATION:
@@ -6711,10 +6713,12 @@
     x->best_mv.as_mv.row *= 8;
     x->best_mv.as_mv.col *= 8;
   }
-  if (bestsme < INT_MAX && cpi->common.cur_frame_force_integer_mv == 0) {
+  const int use_fractional_mv =
+      bestsme < INT_MAX && cpi->common.cur_frame_force_integer_mv == 0;
 #else
-  if (bestsme < INT_MAX) {
+  const int use_fractional_mv = bestsme < INT_MAX;
 #endif
+  if (use_fractional_mv) {
     int dis; /* TODO: use dis in distortion calculation later. */
     unsigned int sse;
     bestsme = cpi->find_fractional_mv_step(