From 4e5e5fc52b9b8d4ba1a3a712dfea6418e1bd4fc9 Mon Sep 17 00:00:00 2001 From: Johann Date: Tue, 18 Aug 2015 11:47:00 -0700 Subject: [PATCH] Rename vp8 loopfilter[_neon.c] Avoid conflict with vpx_dsp version Change-Id: I041b1532a9276400a5547de8dfed1de43ad4e83d --- .../arm/neon/{loopfilter_neon.c => vp8_loopfilter_neon.c} | 0 vp8/common/{loopfilter.c => vp8_loopfilter.c} | 0 vp8/vp8_common.mk | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename vp8/common/arm/neon/{loopfilter_neon.c => vp8_loopfilter_neon.c} (100%) rename vp8/common/{loopfilter.c => vp8_loopfilter.c} (100%) diff --git a/vp8/common/arm/neon/loopfilter_neon.c b/vp8/common/arm/neon/vp8_loopfilter_neon.c similarity index 100% rename from vp8/common/arm/neon/loopfilter_neon.c rename to vp8/common/arm/neon/vp8_loopfilter_neon.c diff --git a/vp8/common/loopfilter.c b/vp8/common/vp8_loopfilter.c similarity index 100% rename from vp8/common/loopfilter.c rename to vp8/common/vp8_loopfilter.c diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index f37fa0b90..b8e558d48 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -53,7 +53,7 @@ VP8_COMMON_SRCS-yes += common/swapyv12buffer.h VP8_COMMON_SRCS-yes += common/systemdependent.h VP8_COMMON_SRCS-yes += common/threading.h VP8_COMMON_SRCS-yes += common/treecoder.h -VP8_COMMON_SRCS-yes += common/loopfilter.c +VP8_COMMON_SRCS-yes += common/vp8_loopfilter.c VP8_COMMON_SRCS-yes += common/loopfilter_filters.c VP8_COMMON_SRCS-yes += common/mbpitch.c VP8_COMMON_SRCS-yes += common/modecont.c @@ -161,7 +161,7 @@ VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/idct_blk_neon.c VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/idct_dequant_0_2x_neon.c VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/idct_dequant_full_2x_neon.c VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/iwalsh_neon.c -VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/loopfilter_neon.c +VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp8_loopfilter_neon.c VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/loopfiltersimplehorizontaledge_neon.c VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/loopfiltersimpleverticaledge_neon.c VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/mbloopfilter_neon.c -- 2.50.1