Merge "Removing plane_block_{width, height} functions."

author Dmitry Kovalev <dkovalev@google.com>

Fri, 22 Nov 2013 00:37:27 +0000 (16:37 -0800)

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

Fri, 22 Nov 2013 00:37:27 +0000 (16:37 -0800)
author Dmitry Kovalev <dkovalev@google.com>
Fri, 22 Nov 2013 00:37:27 +0000 (16:37 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 22 Nov 2013 00:37:27 +0000 (16:37 -0800)
diff --cc vp9/encoder/vp9_encodemb.c
Simple merge
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
author	Dmitry Kovalev <dkovalev@google.com>
	Fri, 22 Nov 2013 00:37:27 +0000 (16:37 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Fri, 22 Nov 2013 00:37:27 +0000 (16:37 -0800)
		1	2
vp9/encoder/vp9_encodemb.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history