commit c27fc14b02dd41f677290022b0de2d296f5e6dca
author Yaowu Xu <yaowu@google.com> Mon Aug 22 16:08:15 2016 -0700
committer Yaowu Xu <yaowu@google.com> Wed Aug 31 17:26:24 2016 -0700
tree 4efe2eb5549de86dc09449e694be310236f867cf
parent b1fb998c460e22d9b119d5b66b6609c4a544876f

Port folder renaming changes from AOM

Manually cherry-picked commits:
ceef058 libvpx->libaom part2
3d26d91 libvpx -> libaom
cfea7dd vp10/ -> av1/
3a8eff7 Fix a build issue for a test
bf4202e Rename vpx to aom

Change-Id: I1b0eb5a40796e3aaf41c58984b4229a439a597dc

y4minput.c

diff --git a/y4minput.c b/y4minput.c
index 7de859f..0a923c1 100644
--- a/y4minput.c
+++ b/y4minput.c
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "vpx/vpx_integer.h"
+#include "aom/vpx_integer.h"
 #include "y4minput.h"
 
 // Reads 'size' bytes from 'file' into 'buf' with some fault tolerance.
@@ -1101,7 +1101,7 @@
     We don't use vpx_img_wrap() because it forces padding for odd picture
      sizes, which would require a separate fread call for every row.*/
   memset(_img, 0, sizeof(*_img));
-  /*Y4M has the planes in Y'CbCr order, which libvpx calls Y, U, and V.*/
+  /*Y4M has the planes in Y'CbCr order, which libaom calls Y, U, and V.*/
   _img->fmt = _y4m->vpx_fmt;
   _img->w = _img->d_w = _y4m->pic_w;
   _img->h = _img->d_h = _y4m->pic_h;