libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_skin_detection.c

 /*
  *  Copyright (c) 2015 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 42 matching lines @@
 void vp9_compute_skin_map(VP9_COMP *const cpi, FILE *yuv_skinmap_file) {
   int i, j, mi_row, mi_col;
   VP9_COMMON *const cm = &cpi->common;
   uint8_t *y;
   const uint8_t *src_y = cpi->Source->y_buffer;
   const uint8_t *src_u = cpi->Source->u_buffer;
   const uint8_t *src_v = cpi->Source->v_buffer;
   const int src_ystride = cpi->Source->y_stride;
   const int src_uvstride = cpi->Source->uv_stride;
   YV12_BUFFER_CONFIG skinmap;
-  vpx_memset(&skinmap, 0, sizeof(YV12_BUFFER_CONFIG));
+  memset(&skinmap, 0, sizeof(YV12_BUFFER_CONFIG));
   if (vp9_alloc_frame_buffer(&skinmap, cm->width, cm->height,
                                cm->subsampling_x, cm->subsampling_y,
                                VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment)) {
       vp9_free_frame_buffer(&skinmap);
       return;
   }
-  vpx_memset(skinmap.buffer_alloc, 128, skinmap.frame_size);
+  memset(skinmap.buffer_alloc, 128, skinmap.frame_size);
   y = skinmap.y_buffer;
   // Loop through 8x8 blocks and set skin map based on center pixel of block.
   // Set y to white for skin block, otherwise set to source with gray scale.
   // Ignore rightmost/bottom boundary blocks.
   for (mi_row = 0; mi_row < cm->mi_rows - 1; ++mi_row) {
     for (mi_col = 0; mi_col < cm->mi_cols - 1; ++mi_col) {
       // Use middle pixel for each 8x8 block for skin detection.
       // If middle pixel is skin, assign whole 8x8 block to skin.
       const uint8_t ysource = src_y[4 * src_ystride + 4];
       const uint8_t usource = src_u[2 * src_uvstride + 2];
@@ skipping 14 matching lines @@
     }
     y += (src_ystride << 3) - ((cm->mi_cols - 1) << 3);
     src_y += (src_ystride << 3) - ((cm->mi_cols - 1) << 3);
     src_u += (src_uvstride << 2) - ((cm->mi_cols - 1) << 2);
     src_v += (src_uvstride << 2) - ((cm->mi_cols - 1) << 2);
   }
   vp9_write_yuv_frame_420(&skinmap, yuv_skinmap_file);
   vp9_free_frame_buffer(&skinmap);
 }
 #endif