Revert r97185 "Update libvpx snapshot to v0.9.7-p1 (Cayuga)."

libvpx/source/libvpx/vpx_mem/include/nds/vpx_mem_nds.h

 /*
  *  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.
  */
 
 
-#ifndef __INC_EXTEND_H
-#define __INC_EXTEND_H
+#ifndef __VPX_MEM_NDS_H__
+#define __VPX_MEM_NDS_H__
 
-#include "vpx_scale/yv12config.h"
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
-void vp8_extend_mb_row(YV12_BUFFER_CONFIG *ybf, unsigned char *YPtr, unsigned char *UPtr, unsigned char *VPtr);
-void vp8_copy_and_extend_frame(YV12_BUFFER_CONFIG *src,
-                               YV12_BUFFER_CONFIG *dst);
+#include <nitro.h>
+#include <nitro/os.h>
 
+    void *vpx_mem_nds_alloc(osarena_id id, osheap_handle handle, size_t size, size_t align);
+    void vpx_mem_nds_free(osarena_id id, osheap_handle handle, void *mem);
+    int vpx_nds_alloc_heap(osarena_id id, u32 size);
+
+#if defined(__cplusplus)
+}
 #endif
+
+#endif /*__VPX_MEM_NDS_H__*/