libvpx: Pull from upstream

source/libvpx/vp8/common/idct_blk.c

 /*
  *  Copyright (c) 2010 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 15 matching lines @@
 
     for (i = 0; i < 4; i++)
     {
         for (j = 0; j < 4; j++)
         {
             if (*eobs++ > 1)
                 vp8_dequant_idct_add_c (q, dq, dst, stride);
             else
             {
                 vp8_dc_only_idct_add_c (q[0]*dq[0], dst, stride, dst, stride);
-                vpx_memset(q, 0, 2 * sizeof(q[0]));
+                memset(q, 0, 2 * sizeof(q[0]));
             }
 
             q   += 16;
             dst += 4;
         }
 
         dst += 4*stride - 16;
     }
 }
 
 void vp8_dequant_idct_add_uv_block_c
             (short *q, short *dq,
              unsigned char *dstu, unsigned char *dstv, int stride, char *eobs)
 {
     int i, j;
 
     for (i = 0; i < 2; i++)
     {
         for (j = 0; j < 2; j++)
         {
             if (*eobs++ > 1)
                 vp8_dequant_idct_add_c (q, dq, dstu, stride);
             else
             {
                 vp8_dc_only_idct_add_c (q[0]*dq[0], dstu, stride, dstu, stride);
-                vpx_memset(q, 0, 2 * sizeof(q[0]));
+                memset(q, 0, 2 * sizeof(q[0]));
             }
 
             q    += 16;
             dstu += 4;
         }
 
         dstu += 4*stride - 8;
     }
 
     for (i = 0; i < 2; i++)
     {
         for (j = 0; j < 2; j++)
         {
             if (*eobs++ > 1)
                 vp8_dequant_idct_add_c (q, dq, dstv, stride);
             else
             {
                 vp8_dc_only_idct_add_c (q[0]*dq[0], dstv, stride, dstv, stride);
-                vpx_memset(q, 0, 2 * sizeof(q[0]));
+                memset(q, 0, 2 * sizeof(q[0]));
             }
 
             q    += 16;
             dstv += 4;
         }
 
         dstv += 4*stride - 8;
     }
 }