From: Johann <johannkoenig@google.com>
Date: Thu, 19 Jun 2014 17:23:53 +0000 (-0700)
Subject: Remove labels from quantize
X-Git-Tag: v1.4.0~1373^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fec6886f2cb29bc58395fa4d5399cd193eae0f52;p=libvpx

Remove labels from quantize

Use break instead of goto for early exit. Unbreaks Visual Studio
builds.

Change-Id: I96dee43a3c82145d4abe0d6a99af6e6e1a3991b5
---

diff --git a/vp8/encoder/x86/quantize_sse2.c b/vp8/encoder/x86/quantize_sse2.c
index f495bf287..291d21992 100644
--- a/vp8/encoder/x86/quantize_sse2.c
+++ b/vp8/encoder/x86/quantize_sse2.c
@@ -26,11 +26,10 @@
         int cmp = (x[z] < boost) | (y[z] == 0); \
         zbin_boost_ptr++; \
         if (cmp) \
-            goto select_eob_end_##i; \
+            break; \
         qcoeff_ptr[z] = y[z]; \
         eob = i; \
         zbin_boost_ptr = b->zrun_zbin_boost; \
-        select_eob_end_##i:; \
     } while (0)
 
 void vp8_regular_quantize_b_sse2(BLOCK *b, BLOCKD *d)
diff --git a/vp8/encoder/x86/quantize_sse4.c b/vp8/encoder/x86/quantize_sse4.c
index b2fecfd2f..601dd23a2 100644
--- a/vp8/encoder/x86/quantize_sse4.c
+++ b/vp8/encoder/x86/quantize_sse4.c
@@ -17,18 +17,16 @@
 
 #define SELECT_EOB(i, z, x, y, q) \
     do { \
-        __label__ select_eob_end; \
         short boost = *zbin_boost_ptr; \
         short x_z = _mm_extract_epi16(x, z); \
         short y_z = _mm_extract_epi16(y, z); \
         int cmp = (x_z < boost) | (y_z == 0); \
         zbin_boost_ptr++; \
         if (cmp) \
-            goto select_eob_end; \
+            break; \
         q = _mm_insert_epi16(q, y_z, z); \
         eob = i; \
         zbin_boost_ptr = b->zrun_zbin_boost; \
-        select_eob_end:; \
     } while (0)
 
 void vp8_regular_quantize_b_sse4_1(BLOCK *b, BLOCKD *d) {