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

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

Index: libvpx/source/libvpx/vpx_mem/include/nds/vpx_mem_nds.h
diff --git a/libvpx/source/libvpx/vp8/common/extend.h b/libvpx/source/libvpx/vpx_mem/include/nds/vpx_mem_nds.h
similarity index 50%
copy from libvpx/source/libvpx/vp8/common/extend.h
copy to libvpx/source/libvpx/vpx_mem/include/nds/vpx_mem_nds.h
index 9e0be4e0661530e5024492de53cc2fd1450a81f4..e54f54d9b1f0a277b4c3690230922b45417aa2e2 100644
--- a/libvpx/source/libvpx/vp8/common/extend.h
+++ b/libvpx/source/libvpx/vpx_mem/include/nds/vpx_mem_nds.h
@@ -9,13 +9,22 @@
  */
 
 
-#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
+
+#include <nitro.h>
+#include <nitro/os.h>
 
-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);
+    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__*/