libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_alloccommon.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.
  */
 
 #include "./vpx_config.h"
 #include "vpx_mem/vpx_mem.h"
 
 #include "vp9/common/vp9_alloccommon.h"
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/common/vp9_entropymode.h"
 #include "vp9/common/vp9_entropymv.h"
 #include "vp9/common/vp9_onyxc_int.h"
-#include "vp9/common/vp9_systemdependent.h"
 
 // TODO(hkuang): Don't need to lock the whole pool after implementing atomic
 // frame reference count.
 void lock_buffer_pool(BufferPool *const pool) {
 #if CONFIG_MULTITHREAD
   pthread_mutex_lock(&pool->pool_mutex);
 #else
   (void)pool;
 #endif
 }
@@ skipping 59 matching lines @@
   int i;
 
   for (i = 0; i < FRAME_BUFFERS; ++i) {
     if (pool->frame_bufs[i].ref_count > 0 &&
         pool->frame_bufs[i].raw_frame_buffer.data != NULL) {
       pool->release_fb_cb(pool->cb_priv, &pool->frame_bufs[i].raw_frame_buffer);
       pool->frame_bufs[i].ref_count = 0;
     }
     vpx_free(pool->frame_bufs[i].mvs);
     pool->frame_bufs[i].mvs = NULL;
-    vp9_free_frame_buffer(&pool->frame_bufs[i].buf);
+    vpx_free_frame_buffer(&pool->frame_bufs[i].buf);
   }
 }
 
 void vp9_free_postproc_buffers(VP9_COMMON *cm) {
 #if CONFIG_VP9_POSTPROC
-  vp9_free_frame_buffer(&cm->post_proc_buffer);
-  vp9_free_frame_buffer(&cm->post_proc_buffer_int);
+  vpx_free_frame_buffer(&cm->post_proc_buffer);
+  vpx_free_frame_buffer(&cm->post_proc_buffer_int);
 #else
   (void)cm;
 #endif
 }
 
 void vp9_free_context_buffers(VP9_COMMON *cm) {
   cm->free_mi(cm);
   free_seg_map(cm);
   vpx_free(cm->above_context);
   cm->above_context = NULL;
@@ skipping 57 matching lines @@
 
 void vp9_swap_current_and_last_seg_map(VP9_COMMON *cm) {
   // Swap indices.
   const int tmp = cm->seg_map_idx;
   cm->seg_map_idx = cm->prev_seg_map_idx;
   cm->prev_seg_map_idx = tmp;
 
   cm->current_frame_seg_map = cm->seg_map_array[cm->seg_map_idx];
   cm->last_frame_seg_map = cm->seg_map_array[cm->prev_seg_map_idx];
 }