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
diff --git a/test/quantize_test.cc b/test/quantize_test.cc
index 0232ab9..bfebdc5 100644
--- a/test/quantize_test.cc
+++ b/test/quantize_test.cc
@@ -22,8 +22,8 @@
#include "vp8/encoder/block.h"
#include "vp8/encoder/onyx_int.h"
#include "vp8/encoder/quantize.h"
-#include "vpx/vpx_integer.h"
-#include "vpx_mem/vpx_mem.h"
+#include "aom/vpx_integer.h"
+#include "aom_mem/vpx_mem.h"
namespace {
#if !CONFIG_AOM_QM
@@ -35,7 +35,7 @@
typedef std::tr1::tuple<VP8Quantize, VP8Quantize> VP8QuantizeParam;
-using libvpx_test::ACMRandom;
+using libaom_test::ACMRandom;
using std::tr1::make_tuple;
// Create and populate a VP8_COMP instance which has a complete set of
@@ -47,7 +47,7 @@
vp8_comp_ = NULL;
vpx_free(macroblockd_dst_);
macroblockd_dst_ = NULL;
- libvpx_test::ClearSystemState();
+ libaom_test::ClearSystemState();
}
protected:
