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 /tools_common.c | |
| 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 'tools_common.c')
| -rw-r--r-- | tools_common.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tools_common.c b/tools_common.c index 20b259ca9..17c0d44f5 100644 --- a/tools_common.c +++ b/tools_common.c @@ -16,11 +16,11 @@ #include "./tools_common.h" -#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER +#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER #include "vpx/vp8cx.h" #endif -#if CONFIG_VP8_DECODER || CONFIG_VP9_DECODER || CONFIG_VP10_DECODER +#if CONFIG_VP8_DECODER || CONFIG_VP9_DECODER #include "vpx/vp8dx.h" #endif @@ -133,10 +133,6 @@ int read_yuv_frame(struct VpxInputContext *input_ctx, vpx_image_t *yuv_frame) { #if CONFIG_ENCODERS static const VpxInterface vpx_encoders[] = { -#if CONFIG_VP10_ENCODER - {"vp10", VP10_FOURCC, &vpx_codec_vp10_cx}, -#endif - #if CONFIG_VP8_ENCODER {"vp8", VP8_FOURCC, &vpx_codec_vp8_cx}, #endif @@ -178,10 +174,6 @@ 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) { |