From 98666368ee7f01a3344c1065abd8700b4002e275 Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 12 Jun 2017 17:54:21 -0700 Subject: [PATCH] rename vp8/common/skin_detection.[hc] -> vp8_* some build systems have trouble with duplicate basenames. vpx_dsp/skin_detection.[hc] were added in: 658e85425 Merge skin detection code in vp8/9. BUG=webm:1438 Change-Id: Ieaa70b40bda409ec23e6d179b47a930ac6243b05 --- vp8/common/{skin_detection.c => vp8_skin_detection.c} | 2 +- vp8/common/{skin_detection.h => vp8_skin_detection.h} | 0 vp8/encoder/onyx_if.c | 2 +- vp8/encoder/pickinter.c | 2 +- vp8/vp8cx.mk | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename vp8/common/{skin_detection.c => vp8_skin_detection.c} (98%) rename vp8/common/{skin_detection.h => vp8_skin_detection.h} (100%) diff --git a/vp8/common/skin_detection.c b/vp8/common/vp8_skin_detection.c similarity index 98% rename from vp8/common/skin_detection.c rename to vp8/common/vp8_skin_detection.c index fbf8765..a0a56bc 100644 --- a/vp8/common/skin_detection.c +++ b/vp8/common/vp8_skin_detection.c @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp8/common/skin_detection.h" #include "vp8/common/alloccommon.h" +#include "vp8/common/vp8_skin_detection.h" #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_mem/vpx_mem.h" #include "vpx_util/vpx_write_yuv_frame.h" diff --git a/vp8/common/skin_detection.h b/vp8/common/vp8_skin_detection.h similarity index 100% rename from vp8/common/skin_detection.h rename to vp8/common/vp8_skin_detection.h diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index d5a5349..b8240af 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -16,7 +16,7 @@ #include "vp8/common/blockd.h" #include "onyx_int.h" #include "vp8/common/systemdependent.h" -#include "vp8/common/skin_detection.h" +#include "vp8/common/vp8_skin_detection.h" #include "vp8/encoder/quantize.h" #include "vp8/common/alloccommon.h" #include "mcomp.h" diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index 341068b..5b7f1f0 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -25,7 +25,7 @@ #include "vp8/common/reconintra4x4.h" #include "vpx_dsp/variance.h" #include "mcomp.h" -#include "vp8/common/skin_detection.h" +#include "vp8/common/vp8_skin_detection.h" #include "rdopt.h" #include "vpx_dsp/vpx_dsp_common.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk index b342100..d6ed7b5 100644 --- a/vp8/vp8cx.mk +++ b/vp8/vp8cx.mk @@ -61,8 +61,8 @@ VP8_CX_SRCS-yes += encoder/ratectrl.c VP8_CX_SRCS-yes += encoder/rdopt.c VP8_CX_SRCS-yes += encoder/segmentation.c VP8_CX_SRCS-yes += encoder/segmentation.h -VP8_CX_SRCS-yes += common/skin_detection.c -VP8_CX_SRCS-yes += common/skin_detection.h +VP8_CX_SRCS-yes += common/vp8_skin_detection.c +VP8_CX_SRCS-yes += common/vp8_skin_detection.h VP8_CX_SRCS-yes += encoder/tokenize.c VP8_CX_SRCS-yes += encoder/dct_value_cost.h VP8_CX_SRCS-yes += encoder/dct_value_tokens.h -- 2.7.4