summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2014-02-04 16:53:27 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-02-04 16:53:27 -0800
commit041104a96506d6e18a2cf10631b1d6e522bf360d (patch)
tree39c3e900de0e97e70f4d7af654a71d98dd1142bd
parentfce6a6a346fea9e5c56152150e01c73ee4793a07 (diff)
parent9d6d35c5efeafc297bbb38e5581ac473be1328a1 (diff)
downloadlibvpx-041104a96506d6e18a2cf10631b1d6e522bf360d.tar
libvpx-041104a96506d6e18a2cf10631b1d6e522bf360d.tar.gz
libvpx-041104a96506d6e18a2cf10631b1d6e522bf360d.tar.bz2
libvpx-041104a96506d6e18a2cf10631b1d6e522bf360d.zip
Merge "Renaming vp9_variance_c.c to vp9_variance.c."
-rw-r--r--vp9/encoder/vp9_variance.c (renamed from vp9/encoder/vp9_variance_c.c)0
-rw-r--r--vp9/vp9cx.mk2
2 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_variance_c.c b/vp9/encoder/vp9_variance.c
index 8bc385089..8bc385089 100644
--- a/vp9/encoder/vp9_variance_c.c
+++ b/vp9/encoder/vp9_variance.c
diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk
index 63003b9c2..131d6c77f 100644
--- a/vp9/vp9cx.mk
+++ b/vp9/vp9cx.mk
@@ -66,7 +66,7 @@ VP9_CX_SRCS-yes += encoder/vp9_resize.h
VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.c
VP9_CX_SRCS-yes += encoder/vp9_tokenize.c
VP9_CX_SRCS-yes += encoder/vp9_treewriter.c
-VP9_CX_SRCS-yes += encoder/vp9_variance_c.c
+VP9_CX_SRCS-yes += encoder/vp9_variance.c
VP9_CX_SRCS-yes += encoder/vp9_vaq.c
VP9_CX_SRCS-yes += encoder/vp9_vaq.h
ifeq ($(CONFIG_VP9_POSTPROC),yes)