]> granicus.if.org Git - libvpx/commitdiff
Merge "Remove unused vp9_copy32xn" into experimental
authorJohn Koleszar <jkoleszar@google.com>
Wed, 27 Feb 2013 20:23:45 +0000 (12:23 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 27 Feb 2013 20:23:45 +0000 (12:23 -0800)
1  2 
vp9/common/vp9_rtcd_defs.sh
vp9/encoder/vp9_onyx_if.c
vp9/vp9cx.mk

Simple merge
Simple merge
diff --cc vp9/vp9cx.mk
index e89381083194690a0b9047d945465ae3b29a9dfb,41f30c6c3b33c09328b0f9909fcca5b06e95b320..65401be3b306e3ecd8940f1b6b0f55d68fbda2f6
@@@ -94,10 -94,9 +94,9 @@@ VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86
  VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_sse2.c
  VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_variance_impl_sse2.asm
  VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2.asm
- VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad_sse2_yasm.asm
- VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad4d_sse2_yasm.asm
+ VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_sad4d_sse2.asm
  VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_fwalsh_sse2.asm
 -VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_quantize_sse2.asm
 +#VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_quantize_sse2.asm
  VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_subtract_sse2.asm
  VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm
  VP9_CX_SRCS-$(HAVE_SSE3) += encoder/x86/vp9_sad_sse3.asm