Merge "Prunes out full-rd computation based on modeled rd"

author Deb Mukherjee <debargha@google.com>

Wed, 10 Jul 2013 22:37:11 +0000 (15:37 -0700)

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

Wed, 10 Jul 2013 22:37:11 +0000 (15:37 -0700)
author Deb Mukherjee <debargha@google.com>
Wed, 10 Jul 2013 22:37:11 +0000 (15:37 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 10 Jul 2013 22:37:11 +0000 (15:37 -0700)
diff --cc vp9/common/vp9_blockd.h
Simple merge
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
author	Deb Mukherjee <debargha@google.com>
	Wed, 10 Jul 2013 22:37:11 +0000 (15:37 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Wed, 10 Jul 2013 22:37:11 +0000 (15:37 -0700)
		1	2
vp9/common/vp9_blockd.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history