Merge branch 'master' into nextgenv2

diff --cc test/test.mk
index 4104fd7facd56641be007bb73f1fd62155234fcc,80b57e505b4c3053f6631f953ff0cce1f061c474..471f87021198025df17b85590b7eaa1ef63747c3
--- 1/test/test.mk
--- 2/test/test.mk
+++ b/test/test.mk
@@@ -170,12 -169,12 +169,17 @@@ LIBVPX_TEST_SRCS-$(CONFIG_VP10_ENCODER
  endif # VP10
  
  ## Multi-codec / unconditional whitebox tests.
+ 
+ ifeq ($(findstring yes,$(CONFIG_VP9_ENCODER)$(CONFIG_VP10_ENCODER)),yes)
+ LIBVPX_TEST_SRCS-yes += avg_test.cc
+ endif
+ 
  LIBVPX_TEST_SRCS-$(CONFIG_ENCODERS) += sad_test.cc
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_txfm_test.h
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_fwd_txfm1d_test.cc
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_inv_txfm1d_test.cc
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_fwd_txfm2d_test.cc
 +LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_inv_txfm2d_test.cc
  
  TEST_INTRA_PRED_SPEED_SRCS-yes := test_intra_pred_speed.cc
  TEST_INTRA_PRED_SPEED_SRCS-yes += ../md5_utils.h ../md5_utils.c

diff --cc vp10/encoder/encodeframe.c
Simple merge

diff --cc vp10/vp10cx.mk
Simple merge

diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge