From: Ronald S. Bultje <rbultje@google.com>
Date: Mon, 4 Mar 2013 20:25:01 +0000 (-0800)
Subject: Rename quantize_sse2.c to quantize_sse2_intrinsics.c to avoid collision.
X-Git-Tag: v1.3.0~1151^2~90^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f60f6db7162e9ce15e6adbcab29851a2fa6b0033;p=libvpx

Rename quantize_sse2.c to quantize_sse2_intrinsics.c to avoid collision.

Change-Id: I5637d491eb6a9b7633f72e03fd9df72131eeb121
---

diff --git a/vp8/encoder/x86/quantize_sse2.c b/vp8/encoder/x86/quantize_sse2_intrinsics.c
similarity index 100%
rename from vp8/encoder/x86/quantize_sse2.c
rename to vp8/encoder/x86/quantize_sse2_intrinsics.c
diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk
index f6feafb6e..2a0e7c526 100644
--- a/vp8/vp8cx.mk
+++ b/vp8/vp8cx.mk
@@ -89,13 +89,13 @@ VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/subtract_mmx.asm
 VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp8_enc_stubs_mmx.c
 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm
 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/fwalsh_sse2.asm
-VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.c
+VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2_intrinsics.c
 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.asm
 
 # TODO(johann) make this generic
 ifeq ($(HAVE_SSE2),yes)
-vp8/encoder/x86/quantize_sse2.c.o: CFLAGS += -msse2
-vp8/encoder/x86/quantize_sse2.c.d: CFLAGS += -msse2
+vp8/encoder/x86/quantize_sse2_intrinsics.c.o: CFLAGS += -msse2
+vp8/encoder/x86/quantize_sse2_intrinsics.c.d: CFLAGS += -msse2
 endif
 
 ifeq ($(CONFIG_TEMPORAL_DENOISING),yes)