diff options
| author | Jingning Han <jingning@google.com> | 2015-08-12 01:57:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-12 01:57:15 +0000 |
| commit | be6c031fb3b0ee940c852a6a2db63af4747ff022 (patch) | |
| tree | bdefb7fb5f2b3fa276410f308c2c167f27fcf4c4 /tools_common.c | |
| parent | 70deaf00eb4a035247fd102337f949bff7b1f232 (diff) | |
| parent | 3ee6db6c8110680c051fe7a4dca97bb27474ca00 (diff) | |
| download | libvpx-be6c031fb3b0ee940c852a6a2db63af4747ff022.tar libvpx-be6c031fb3b0ee940c852a6a2db63af4747ff022.tar.gz libvpx-be6c031fb3b0ee940c852a6a2db63af4747ff022.tar.bz2 libvpx-be6c031fb3b0ee940c852a6a2db63af4747ff022.zip | |
Merge "Fork VP9 and VP10 codebase"
Diffstat (limited to 'tools_common.c')
| -rw-r--r-- | tools_common.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools_common.c b/tools_common.c index fe3401c79..5c28037fc 100644 --- a/tools_common.c +++ b/tools_common.c @@ -16,11 +16,11 @@ #include "./tools_common.h" -#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER +#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER #include "vpx/vp8cx.h" #endif -#if CONFIG_VP8_DECODER || CONFIG_VP9_DECODER +#if CONFIG_VP8_DECODER || CONFIG_VP9_DECODER || CONFIG_VP10_DECODER #include "vpx/vp8dx.h" #endif @@ -140,6 +140,10 @@ static const VpxInterface vpx_encoders[] = { #if CONFIG_VP9_ENCODER {"vp9", VP9_FOURCC, &vpx_codec_vp9_cx}, #endif + +#if CONFIG_VP10_ENCODER + {"vp10", VP10_FOURCC, &vpx_codec_vp10_cx}, +#endif }; int get_vpx_encoder_count(void) { @@ -174,6 +178,10 @@ static const VpxInterface vpx_decoders[] = { #if CONFIG_VP9_DECODER {"vp9", VP9_FOURCC, &vpx_codec_vp9_dx}, #endif + +#if CONFIG_VP10_DECODER + {"vp10", VP10_FOURCC, &vpx_codec_vp10_dx}, +#endif }; int get_vpx_decoder_count(void) { |