From e54a5782b947c9840d5a6bedbd357f2886d299c0 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@google.com>
Date: Wed, 17 Jul 2013 17:24:33 -0700
Subject: [PATCH] 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
---
vp9/encoder/vp9_rdopt.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index aea39f2e4e..4e6e1c8313 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;
--
GitLab