summaryrefslogtreecommitdiff
path: root/vp9/vp9cx.mk
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2015-12-15 03:41:22 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-12-15 03:41:22 +0000
commitb81f04a0cc5344e47389f1a1e852d319e4e389fe (patch)
tree9b2695a9e7e88a337f95e1dd6691a54a94a09d83 /vp9/vp9cx.mk
parentb7654afb6baba32d9dcafed558cb20575e692ae5 (diff)
parentd36659cec7fab96cedc67db4d511ed7135637d0e (diff)
downloadlibvpx-b81f04a0cc5344e47389f1a1e852d319e4e389fe.tar
libvpx-b81f04a0cc5344e47389f1a1e852d319e4e389fe.tar.gz
libvpx-b81f04a0cc5344e47389f1a1e852d319e4e389fe.tar.bz2
libvpx-b81f04a0cc5344e47389f1a1e852d319e4e389fe.zip
Merge "move vp9_avg to vpx_dsp"
Diffstat (limited to 'vp9/vp9cx.mk')
-rw-r--r--vp9/vp9cx.mk5
1 files changed, 0 insertions, 5 deletions
diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk
index 5918240e2..de688bf48 100644
--- a/vp9/vp9cx.mk
+++ b/vp9/vp9cx.mk
@@ -17,7 +17,6 @@ VP9_CX_SRCS_REMOVE-no += $(VP9_COMMON_SRCS_REMOVE-no)
VP9_CX_SRCS-yes += vp9_cx_iface.c
-VP9_CX_SRCS-yes += encoder/vp9_avg.c
VP9_CX_SRCS-yes += encoder/vp9_bitstream.c
VP9_CX_SRCS-yes += encoder/vp9_context_tree.c
VP9_CX_SRCS-yes += encoder/vp9_context_tree.h
@@ -93,7 +92,6 @@ VP9_CX_SRCS-yes += encoder/vp9_temporal_filter.h
VP9_CX_SRCS-yes += encoder/vp9_mbgraph.c
VP9_CX_SRCS-yes += encoder/vp9_mbgraph.h
-VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_avg_intrin_sse2.c
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm
VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_quantize_sse2.c
VP9_CX_SRCS-$(HAVE_AVX) += encoder/x86/vp9_diamond_search_sad_avx.c
@@ -114,7 +112,6 @@ endif
ifeq ($(ARCH_X86_64),yes)
ifeq ($(CONFIG_USE_X86INC),yes)
VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_quantize_ssse3_x86_64.asm
-VP9_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_dct_ssse3_x86_64.asm
endif
endif
@@ -131,10 +128,8 @@ ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
VP9_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_dct_neon.c
VP9_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_error_neon.c
endif
-VP9_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_avg_neon.c
VP9_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_quantize_neon.c
-VP9_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_avg_msa.c
VP9_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_error_msa.c
VP9_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct4x4_msa.c
VP9_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct8x8_msa.c