summaryrefslogtreecommitdiffstats
path: root/libvpx/test/set_roi.cc
diff options
context:
space:
mode:
authorVignesh Venkatasubramanian <vigneshv@google.com>2014-03-26 15:13:32 -0700
committerVignesh Venkatasubramanian <vigneshv@google.com>2014-03-26 15:13:32 -0700
commit2ec72e65689c948e92b826ae1e867bf369e72f13 (patch)
tree09d08252ba727c6c2e090222ea15ccc3b143301a /libvpx/test/set_roi.cc
parent9b35249446b07f40ac5fcc3205f2c048616efacc (diff)
downloadandroid_external_libvpx-2ec72e65689c948e92b826ae1e867bf369e72f13.tar.gz
android_external_libvpx-2ec72e65689c948e92b826ae1e867bf369e72f13.tar.bz2
android_external_libvpx-2ec72e65689c948e92b826ae1e867bf369e72f13.zip
libvpx: Roll latest libvpx
Pulling changes related to fixing a rare bitstream issue on video upscaling. Also enables VP9 encoder. This is exactly the same as the roll that is already in master. Upstream Hash: 8e9c9f118cda45013f14cce7961dcc8df78ffebf Change-Id: Iba9bb1c1804462014deab20fa6f4c5e4c55a778e
Diffstat (limited to 'libvpx/test/set_roi.cc')
-rw-r--r--libvpx/test/set_roi.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/libvpx/test/set_roi.cc b/libvpx/test/set_roi.cc
index 9d2e771..e28f511 100644
--- a/libvpx/test/set_roi.cc
+++ b/libvpx/test/set_roi.cc
@@ -18,11 +18,9 @@
#include "third_party/googletest/src/include/gtest/gtest.h"
#include "test/acm_random.h"
+#include "vp8/encoder/onyx_int.h"
#include "vpx/vpx_integer.h"
#include "vpx_mem/vpx_mem.h"
-extern "C" {
-#include "vp8/encoder/onyx_int.h"
-}
using libvpx_test::ACMRandom;