Merge "mips msa vp9 subpel variance optimization"

diff --cc vp9/common/vp9_rtcd_defs.pl
Simple merge

diff --cc vp9/vp9cx.mk
index f670d82e7fe71acfe2d0a94eb6f274cb5ce02f5c,dca9a6cbd0acc8e6483110beba4ca8781a8210f4..216dc81c9a1ff0cee3dd700f9b89761c4215f80a
--- 1/vp9/vp9cx.mk
--- 2/vp9/vp9cx.mk
+++ b/vp9/vp9cx.mk
@@@ -159,6 -161,8 +159,7 @@@ VP9_CX_SRCS-$(HAVE_MSA) += encoder/mips
  VP9_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct16x16_msa.c
  VP9_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct32x32_msa.c
  VP9_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct_msa.h
 -VP9_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_subtract_msa.c
  VP9_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_temporal_filter_msa.c
+ VP9_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_variance_msa.c
  
  VP9_CX_SRCS-yes := $(filter-out $(VP9_CX_SRCS_REMOVE-yes),$(VP9_CX_SRCS-yes))