Merge "Add rectangular block size variance/sad functions." into experimental

author Ronald S. Bultje <rbultje@google.com>

Mon, 15 Apr 2013 21:20:25 +0000 (14:20 -0700)

committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>

Mon, 15 Apr 2013 21:20:25 +0000 (14:20 -0700)
author Ronald S. Bultje <rbultje@google.com>
Mon, 15 Apr 2013 21:20:25 +0000 (14:20 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 15 Apr 2013 21:20:25 +0000 (14:20 -0700)
diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge
diff --cc vp9/encoder/vp9_onyx_int.h
Simple merge
author	Ronald S. Bultje <rbultje@google.com>
	Mon, 15 Apr 2013 21:20:25 +0000 (14:20 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Mon, 15 Apr 2013 21:20:25 +0000 (14:20 -0700)
		1	2
vp9/encoder/vp9_onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_onyx_int.h	patch \|	diff1 \|	diff2 \|	blob \| history