From 8f270acfb206aa207a8e8caa5979a98405ee82e8 Mon Sep 17 00:00:00 2001
From: Jim Bankoski <jimbankoski@google.com>
Date: Thu, 28 Feb 2013 13:58:15 -0800
Subject: [PATCH] mv dct_sse2.c dct_sse2_intrinsics.c to avoid collision
Change-Id: Id786be31da3c91d95d2955aa569ecdc6e66650df
---
.../x86/{vp9_dct_sse2.c => vp9_dct_sse2_intrinsics.c} | 0
vp9/vp9cx.mk | 6 +++---
2 files changed, 3 insertions(+), 3 deletions(-)
rename vp9/encoder/x86/{vp9_dct_sse2.c => vp9_dct_sse2_intrinsics.c} (100%)
diff --git a/vp9/encoder/x86/vp9_dct_sse2.c b/vp9/encoder/x86/vp9_dct_sse2_intrinsics.c
similarity index 100%
rename from vp9/encoder/x86/vp9_dct_sse2.c
rename to vp9/encoder/x86/vp9_dct_sse2_intrinsics.c
diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk
index 22fa565e57..43dba1373d 100644
--- a/vp9/vp9cx.mk
+++ b/vp9/vp9cx.mk
@@ -110,10 +110,10 @@ VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_quantize_mmx.asm
VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_encodeopt.asm
VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.asm
-VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c
+VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2_intrinsics.c
ifeq ($(HAVE_SSE2),yes)
-vp9/encoder/x86/vp9_dct_sse2.c.d: CFLAGS += -msse2
-vp9/encoder/x86/vp9_dct_sse2.c.o: CFLAGS += -msse2
+vp9/encoder/x86/vp9_dct_sse2_intrinsics.c.d: CFLAGS += -msse2
+vp9/encoder/x86/vp9_dct_sse2_intrinsics.c.o: CFLAGS += -msse2
endif
--
GitLab