Merge branch 'vp9-preview' of review:webm/libvpx

Merge the vp9-preview branch into master. Change-Id: If700b9054676f24bed9deb59050af546c1ca5296
2012-12-21 15:20:41 -08:00
parent b9ce430292 5ebe94f9f1
commit 16810c10c1
406 changed files with 101264 additions and 14340 deletions
--- a/test/sixtap_predict_test.cc
+++ b/test/sixtap_predict_test.cc
@@ -17,7 +17,7 @@
 #include "third_party/googletest/src/include/gtest/gtest.h"
 extern "C" {
 #include "./vpx_config.h"
-#include "./vpx_rtcd.h"
+#include "./vp8_rtcd.h"
 #include "vpx/vpx_integer.h"
 #include "vpx_mem/vpx_mem.h"
 }