diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-03-04 12:25:01 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-03-04 12:25:01 -0800 |
| commit | f60f6db7162e9ce15e6adbcab29851a2fa6b0033 (patch) | |
| tree | 26bc48aa05162d6e05bbb3a8172c458266cd6684 | |
| parent | 2d3e879fccef330d89f5e5ae6c718cb37d888d2a (diff) | |
| download | libvpx-f60f6db7162e9ce15e6adbcab29851a2fa6b0033.tar libvpx-f60f6db7162e9ce15e6adbcab29851a2fa6b0033.tar.gz libvpx-f60f6db7162e9ce15e6adbcab29851a2fa6b0033.tar.bz2 libvpx-f60f6db7162e9ce15e6adbcab29851a2fa6b0033.zip | |
Rename quantize_sse2.c to quantize_sse2_intrinsics.c to avoid collision.
Change-Id: I5637d491eb6a9b7633f72e03fd9df72131eeb121
| -rw-r--r-- | vp8/encoder/x86/quantize_sse2_intrinsics.c (renamed from vp8/encoder/x86/quantize_sse2.c) | 0 | ||||
| -rw-r--r-- | vp8/vp8cx.mk | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vp8/encoder/x86/quantize_sse2.c b/vp8/encoder/x86/quantize_sse2_intrinsics.c index 55d57ad62..55d57ad62 100644 --- a/vp8/encoder/x86/quantize_sse2.c +++ b/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) |