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 /build | |
| 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 'build')
| -rw-r--r-- | build/make/Android.mk | 3 | ||||
| -rw-r--r-- | build/make/configure.sh | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/build/make/Android.mk b/build/make/Android.mk index df01dece6..9eb6dd280 100644 --- a/build/make/Android.mk +++ b/build/make/Android.mk @@ -174,9 +174,6 @@ endif ifeq ($(CONFIG_VP9), yes) $$(rtcd_dep_template_SRCS): vp9_rtcd.h endif -ifeq ($(CONFIG_VP10), yes) -$$(rtcd_dep_template_SRCS): vp10_rtcd.h -endif $$(rtcd_dep_template_SRCS): vpx_scale_rtcd.h $$(rtcd_dep_template_SRCS): vpx_dsp_rtcd.h diff --git a/build/make/configure.sh b/build/make/configure.sh index 89c32b0f9..028321330 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -190,7 +190,7 @@ enable_codec(){ enabled $1 || echo " enabling $1" set_all yes $1 - is_in $1 vp8 vp9 vp10 && \ + is_in $1 vp8 vp9 && \ set_all yes $1_encoder && \ set_all yes $1_decoder } @@ -199,7 +199,7 @@ disable_codec(){ disabled $1 || echo " disabling $1" set_all no $1 - is_in $1 vp8 vp9 vp10 && \ + is_in $1 vp8 vp9 && \ set_all no $1_encoder && \ set_all no $1_decoder } |