commit cebe6f0cf59cbcb11a1fb5c306dd2931cc647297
author Adrian Grange <agrange@google.com> Fri Mar 25 12:11:05 2016 -0700
committer Adrian Grange <agrange@google.com> Fri Mar 25 12:25:01 2016 -0700
tree a003fb7b74aeb3f6055f1febc6328ecae06524cb
parent 17b0567940c3d1f5531223d62f493128d4f1ea97

Convert "vpx" to "aom"

Change the name of source files to replace "vpx" with "aom".
Change occurences of "vpx" in the code to "aom".

Change-Id: I002c0eaa2c350cf1a895bf01bea5788c61328027

av1/encoder/extend.c

diff --git a/av1/encoder/extend.c b/av1/encoder/extend.c
index 8a8c5ca..efb6515 100644
--- a/av1/encoder/extend.c
+++ b/av1/encoder/extend.c
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#include "aom_dsp/vpx_dsp_common.h"
-#include "aom_mem/vpx_mem.h"
+#include "aom_dsp/aom_dsp_common.h"
+#include "aom_mem/aom_mem.h"
 #include "aom_ports/mem.h"
 
 #include "av1/common/common.h"
@@ -73,9 +73,9 @@
   uint16_t *dst_ptr2 = dst + w;
 
   for (i = 0; i < h; i++) {
-    vpx_memset16(dst_ptr1, src_ptr1[0], extend_left);
+    aom_memset16(dst_ptr1, src_ptr1[0], extend_left);
     memcpy(dst_ptr1 + extend_left, src_ptr1, w * sizeof(src_ptr1[0]));
-    vpx_memset16(dst_ptr2, src_ptr2[0], extend_right);
+    aom_memset16(dst_ptr2, src_ptr2[0], extend_right);
     src_ptr1 += src_pitch;
     src_ptr2 += src_pitch;
     dst_ptr1 += dst_pitch;