diff options
| author | James Zern <jzern@google.com> | 2016-06-17 15:22:11 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2016-06-17 18:26:08 -0700 |
| commit | 67edc5e83be285004804c67c5348bbc81503a04d (patch) | |
| tree | f00adb277cd8e3de6afa36ebb764c59a8deeb720 /test/encode_test_driver.h | |
| parent | 1417ed28f362a21790ba59a55189d3486a81bff1 (diff) | |
| download | libvpx-67edc5e83be285004804c67c5348bbc81503a04d.tar libvpx-67edc5e83be285004804c67c5348bbc81503a04d.tar.gz libvpx-67edc5e83be285004804c67c5348bbc81503a04d.tar.bz2 libvpx-67edc5e83be285004804c67c5348bbc81503a04d.zip | |
remove vp10
development has moved to the nextgenv2 branch and a snapshot from here
was used to seed aomedia
BUG=b/29457125
Change-Id: Iedaca11ec7870fb3a4e50b2c9ea0c2b056a0d3c0
Diffstat (limited to 'test/encode_test_driver.h')
| -rw-r--r-- | test/encode_test_driver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h index 6d0a72f98..d14ddc7d7 100644 --- a/test/encode_test_driver.h +++ b/test/encode_test_driver.h @@ -16,7 +16,7 @@ #include "third_party/googletest/src/include/gtest/gtest.h" #include "./vpx_config.h" -#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER +#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER #include "vpx/vp8cx.h" #endif #include "vpx/vpx_encoder.h" @@ -143,7 +143,7 @@ class Encoder { const vpx_codec_err_t res = vpx_codec_control_(&encoder_, ctrl_id, arg); ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError(); } -#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER +#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER void Control(int ctrl_id, vpx_active_map_t *arg) { const vpx_codec_err_t res = vpx_codec_control_(&encoder_, ctrl_id, arg); ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError(); |