summaryrefslogtreecommitdiff
path: root/vp8
diff options
context:
space:
mode:
authorJohann <johannkoenig@google.com>2018-03-04 12:31:04 -0800
committerJohann <johannkoenig@google.com>2018-03-04 12:38:07 -0800
commite0b88b5c00b8026876da72e2f6c6fadf479d394d (patch)
tree2d9dd23ff2abca5524be84113cfc0f3709f88f05 /vp8
parentc6fcb9bb94ea02324d9d842b71ac3d0ab0329c10 (diff)
downloadlibvpx-e0b88b5c00b8026876da72e2f6c6fadf479d394d.tar
libvpx-e0b88b5c00b8026876da72e2f6c6fadf479d394d.tar.gz
libvpx-e0b88b5c00b8026876da72e2f6c6fadf479d394d.tar.bz2
libvpx-e0b88b5c00b8026876da72e2f6c6fadf479d394d.zip
move vp8 encodeopt to block_error_sse2
The file contains sse2 implementations related to various block error functions. Update the .mk file to include it only when sse2 is requested. BUG=webm:1500 Change-Id: I67b766faed425fd7a96db8541b13c69670b65fec
Diffstat (limited to 'vp8')
-rw-r--r--vp8/encoder/x86/block_error_sse2.asm (renamed from vp8/encoder/x86/encodeopt.asm)0
-rw-r--r--vp8/vp8cx.mk2
2 files changed, 1 insertions, 1 deletions
diff --git a/vp8/encoder/x86/encodeopt.asm b/vp8/encoder/x86/block_error_sse2.asm
index f6c6aeae7..f6c6aeae7 100644
--- a/vp8/encoder/x86/encodeopt.asm
+++ b/vp8/encoder/x86/block_error_sse2.asm
diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk
index 0dac0169d..ab85eddd2 100644
--- a/vp8/vp8cx.mk
+++ b/vp8/vp8cx.mk
@@ -92,9 +92,9 @@ ifeq ($(CONFIG_TEMPORAL_DENOISING),yes)
VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/denoising_sse2.c
endif
+VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/block_error_sse2.asm
VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm
VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp8_enc_stubs_sse2.c
-VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/encodeopt.asm
ifeq ($(CONFIG_REALTIME_ONLY),yes)
VP8_CX_SRCS_REMOVE-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm