From 907b33cdc432773f04f53e06a7d2d4ac1c434c18 Mon Sep 17 00:00:00 2001 From: Johann Date: Tue, 2 Jun 2015 14:17:24 -0700 Subject: [PATCH] Move vp8 variance files There is a naming conflict in the chromium build system. The rest of the variance functions will move to vpx_dsp soon. Change-Id: Iff78da2aafb0d7380eda73e38d7dac72110a1e47 --- .../{variance_impl_mmx.asm => vp8_variance_impl_mmx.asm} | 0 vp8/common/x86/{variance_mmx.c => vp8_variance_mmx.c} | 0 vp8/common/x86/{variance_sse2.c => vp8_variance_sse2.c} | 0 vp8/vp8_common.mk | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename vp8/common/x86/{variance_impl_mmx.asm => vp8_variance_impl_mmx.asm} (100%) rename vp8/common/x86/{variance_mmx.c => vp8_variance_mmx.c} (100%) rename vp8/common/x86/{variance_sse2.c => vp8_variance_sse2.c} (100%) diff --git a/vp8/common/x86/variance_impl_mmx.asm b/vp8/common/x86/vp8_variance_impl_mmx.asm similarity index 100% rename from vp8/common/x86/variance_impl_mmx.asm rename to vp8/common/x86/vp8_variance_impl_mmx.asm diff --git a/vp8/common/x86/variance_mmx.c b/vp8/common/x86/vp8_variance_mmx.c similarity index 100% rename from vp8/common/x86/variance_mmx.c rename to vp8/common/x86/vp8_variance_mmx.c diff --git a/vp8/common/x86/variance_sse2.c b/vp8/common/x86/vp8_variance_sse2.c similarity index 100% rename from vp8/common/x86/variance_sse2.c rename to vp8/common/x86/vp8_variance_sse2.c diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index c71d592f5..236d8a5d8 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -86,8 +86,8 @@ VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/iwalsh_mmx.asm VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/loopfilter_mmx.asm VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/recon_mmx.asm VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/subpixel_mmx.asm -VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/variance_mmx.c -VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/variance_impl_mmx.asm +VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/vp8_variance_mmx.c +VP8_COMMON_SRCS-$(HAVE_MMX) += common/x86/vp8_variance_impl_mmx.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/copy_sse2.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idct_blk_sse2.c VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idctllm_sse2.asm @@ -96,7 +96,7 @@ VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/recon_wrapper_sse2.c VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/subpixel_sse2.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/loopfilter_sse2.asm VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/iwalsh_sse2.asm -VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/variance_sse2.c +VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp8_variance_sse2.c VP8_COMMON_SRCS-$(HAVE_SSE2) += common/x86/variance_impl_sse2.asm VP8_COMMON_SRCS-$(HAVE_SSE3) += common/x86/copy_sse3.asm VP8_COMMON_SRCS-$(HAVE_SSSE3) += common/x86/subpixel_ssse3.asm -- 2.50.1