Merge "Add a conservative RD based active map in vp9."

author Alex Converse <aconverse@google.com>

Tue, 11 Mar 2014 20:39:33 +0000 (13:39 -0700)

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

Tue, 11 Mar 2014 20:39:33 +0000 (13:39 -0700)
author Alex Converse <aconverse@google.com>
Tue, 11 Mar 2014 20:39:33 +0000 (13:39 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 11 Mar 2014 20:39:33 +0000 (13:39 -0700)
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
diff --cc vp9/vp9_cx_iface.c
Simple merge
author	Alex Converse <aconverse@google.com>
	Tue, 11 Mar 2014 20:39:33 +0000 (13:39 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Tue, 11 Mar 2014 20:39:33 +0000 (13:39 -0700)
		1	2
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/vp9_cx_iface.c	patch \|	diff1 \|	diff2 \|	blob \| history