diff options
| author | Jingning Han <jingning@google.com> | 2015-08-05 19:00:31 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2015-08-11 17:05:28 -0700 |
| commit | 3ee6db6c8110680c051fe7a4dca97bb27474ca00 (patch) | |
| tree | e05e37dfc10ed26a4fdaee5551b13e2d85a7a1b2 /test/encode_test_driver.h | |
| parent | b04dad328c33874ae1eda72c73079519935a3feb (diff) | |
| download | libvpx-3ee6db6c8110680c051fe7a4dca97bb27474ca00.tar libvpx-3ee6db6c8110680c051fe7a4dca97bb27474ca00.tar.gz libvpx-3ee6db6c8110680c051fe7a4dca97bb27474ca00.tar.bz2 libvpx-3ee6db6c8110680c051fe7a4dca97bb27474ca00.zip | |
Fork VP9 and VP10 codebase
This commit folks the VP9 and VP10 codebase and makes libvpx
support VP8, VP9, and VP10.
Change-Id: I81782e0b809acb3c9844bee8c8ec8f4d5e8fa356
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 f7c962186..9ecc4989e 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 +#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER #include "vpx/vp8cx.h" #endif #include "vpx/vpx_encoder.h" @@ -138,7 +138,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 +#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER || CONFIG_VP10_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(); |