libvpx: Pull from upstream

source/libvpx/vp8/encoder/x86/quantize_sse2.c

 /*
  *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 17 matching lines @@
         if (cmp) \
             break; \
         qcoeff_ptr[z] = y[z]; \
         eob = i; \
         zbin_boost_ptr = b->zrun_zbin_boost; \
     } while (0)
 
 void vp8_regular_quantize_b_sse2(BLOCK *b, BLOCKD *d)
 {
     char eob = 0;
-    short *zbin_boost_ptr  = b->zrun_zbin_boost;
+    short *zbin_boost_ptr;
     short *qcoeff_ptr      = d->qcoeff;
-    DECLARE_ALIGNED_ARRAY(16, short, x, 16);
-    DECLARE_ALIGNED_ARRAY(16, short, y, 16);
+    DECLARE_ALIGNED(16, short, x[16]);
+    DECLARE_ALIGNED(16, short, y[16]);
 
     __m128i sz0, x0, sz1, x1, y0, y1, x_minus_zbin0, x_minus_zbin1;
     __m128i quant_shift0 = _mm_load_si128((__m128i *)(b->quant_shift));
     __m128i quant_shift1 = _mm_load_si128((__m128i *)(b->quant_shift + 8));
     __m128i z0 = _mm_load_si128((__m128i *)(b->coeff));
     __m128i z1 = _mm_load_si128((__m128i *)(b->coeff+8));
     __m128i zbin_extra = _mm_cvtsi32_si128(b->zbin_extra);
     __m128i zbin0 = _mm_load_si128((__m128i *)(b->zbin));
     __m128i zbin1 = _mm_load_si128((__m128i *)(b->zbin + 8));
     __m128i round0 = _mm_load_si128((__m128i *)(b->round));
     __m128i round1 = _mm_load_si128((__m128i *)(b->round + 8));
     __m128i quant0 = _mm_load_si128((__m128i *)(b->quant));
     __m128i quant1 = _mm_load_si128((__m128i *)(b->quant + 8));
     __m128i dequant0 = _mm_load_si128((__m128i *)(d->dequant));
     __m128i dequant1 = _mm_load_si128((__m128i *)(d->dequant + 8));
 
-    vpx_memset(qcoeff_ptr, 0, 32);
+    memset(qcoeff_ptr, 0, 32);
 
     /* Duplicate to all lanes. */
     zbin_extra = _mm_shufflelo_epi16(zbin_extra, 0);
     zbin_extra = _mm_unpacklo_epi16(zbin_extra, zbin_extra);
 
     /* Sign of z: z >> 15 */
     sz0 = _mm_srai_epi16(z0, 15);
     sz1 = _mm_srai_epi16(z1, 15);
 
     /* x = abs(z): (z ^ sz) - sz */
@@ skipping 150 matching lines @@
 
   x0 = _mm_max_epi16(x0, x1);
 
   /* okay, just 2! */
   x1 = _mm_shufflelo_epi16(x0, 0x1); // 0b00000001
 
   x0 = _mm_max_epi16(x0, x1);
 
   *d->eob = 0xFF & _mm_cvtsi128_si32(x0);
 }