diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-11-19 14:41:33 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-19 14:41:33 -0800 |
| commit | f92cfa1ca6cfb8422b10e908ad081ab5cbd3cff4 (patch) | |
| tree | 2d7ba0753f1d966dbd2d6916d47c6c665b1167cd /vp9 | |
| parent | ff4f1c4b7663695aed883dc66221bb0899f11ac2 (diff) | |
| parent | 30b03050a23e2f4af099ea94f15f1f9c4155e3bc (diff) | |
| download | libvpx-f92cfa1ca6cfb8422b10e908ad081ab5cbd3cff4.tar libvpx-f92cfa1ca6cfb8422b10e908ad081ab5cbd3cff4.tar.gz libvpx-f92cfa1ca6cfb8422b10e908ad081ab5cbd3cff4.tar.bz2 libvpx-f92cfa1ca6cfb8422b10e908ad081ab5cbd3cff4.zip | |
Merge "Move vp9_sadmxn.h from common to encoder"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_sad_c.c | 6 | ||||
| -rw-r--r-- | vp9/encoder/vp9_sadmxn.h (renamed from vp9/common/vp9_sadmxn.h) | 0 | ||||
| -rw-r--r-- | vp9/vp9_common.mk | 1 | ||||
| -rw-r--r-- | vp9/vp9cx.mk | 1 |
4 files changed, 4 insertions, 4 deletions
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 <stdlib.h> -#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 index b2dfd63f9..b2dfd63f9 100644 --- a/vp9/common/vp9_sadmxn.h +++ b/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 |