From 30b03050a23e2f4af099ea94f15f1f9c4155e3bc Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Tue, 19 Nov 2013 12:46:08 -0800 Subject: [PATCH] Move vp9_sadmxn.h from common to encoder Change-Id: I6f6ba91b1b8b280902b171472314d665aa0baf0b --- vp9/encoder/vp9_sad_c.c | 6 +++--- vp9/{common => encoder}/vp9_sadmxn.h | 0 vp9/vp9_common.mk | 1 - vp9/vp9cx.mk | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) rename vp9/{common => encoder}/vp9_sadmxn.h (100%) diff --git a/vp9/encoder/vp9_sad_c.c b/vp9/encoder/vp9_sad_c.c index 42ddb21a5..55d595baf 100644 --- a/vp9/encoder/vp9_sad_c.c +++ b/vp9/encoder/vp9_sad_c.c @@ -10,11 +10,11 @@ #include -#include "vp9/common/vp9_sadmxn.h" -#include "vp9/encoder/vp9_variance.h" +#include "./vp9_rtcd.h" #include "./vpx_config.h" +#include "vp9/encoder/vp9_sadmxn.h" +#include "vp9/encoder/vp9_variance.h" #include "vpx/vpx_integer.h" -#include "./vp9_rtcd.h" #define sad_mxn_func(m, n) \ unsigned int vp9_sad##m##x##n##_c(const uint8_t *src_ptr, \ diff --git a/vp9/common/vp9_sadmxn.h b/vp9/encoder/vp9_sadmxn.h similarity index 100% rename from vp9/common/vp9_sadmxn.h rename to vp9/encoder/vp9_sadmxn.h diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index 57ede0fd3..c566765bf 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -45,7 +45,6 @@ VP9_COMMON_SRCS-yes += common/vp9_reconinter.h VP9_COMMON_SRCS-yes += common/vp9_reconintra.h VP9_COMMON_SRCS-yes += common/vp9_rtcd.c VP9_COMMON_SRCS-yes += common/vp9_rtcd_defs.sh -VP9_COMMON_SRCS-yes += common/vp9_sadmxn.h VP9_COMMON_SRCS-yes += common/vp9_scale.h VP9_COMMON_SRCS-yes += common/vp9_scale.c VP9_COMMON_SRCS-yes += common/vp9_seg_common.h diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk index b5947797f..bd13518f5 100644 --- a/vp9/vp9cx.mk +++ b/vp9/vp9cx.mk @@ -44,6 +44,7 @@ VP9_CX_SRCS-yes += encoder/vp9_psnr.h VP9_CX_SRCS-yes += encoder/vp9_quantize.h VP9_CX_SRCS-yes += encoder/vp9_ratectrl.h VP9_CX_SRCS-yes += encoder/vp9_rdopt.h +VP9_CX_SRCS-yes += encoder/vp9_sadmxn.h VP9_CX_SRCS-yes += encoder/vp9_tokenize.h VP9_CX_SRCS-yes += encoder/vp9_treewriter.h VP9_CX_SRCS-yes += encoder/vp9_variance.h -- 2.40.0