From: Ronald S. Bultje <rbultje@google.com>
Date: Thu, 18 Jul 2013 00:24:33 +0000 (-0700)
Subject: Change break statement in a 2d loop to a return statement.
X-Git-Tag: v1.3.0~811^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e54a5782b947c9840d5a6bedbd357f2886d299c0;p=libvpx

Change break statement in a 2d loop to a return statement.

The break statement only breaks out of the nested loop, not the
top-level loop, so it doesn't always work as intended. Changing it
to a return statement does what's intended.

Change-Id: I585419823b39a04ec8826b1c8a216099b1728ba7
---

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index aea39f2e4..4e6e1c831 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -1368,13 +1368,10 @@ static int64_t rd_pick_intra4x4mby_modes(VP9_COMP *cpi, MACROBLOCK *mb,
         mic->bmi[i + j].as_mode = best_mode;
 
       if (total_rd >= best_rd)
-        break;
+        return INT64_MAX;
     }
   }
 
-  if (total_rd >= best_rd)
-    return INT64_MAX;
-
   *Rate = cost;
   *rate_y = tot_rate_y;
   *Distortion = distortion;