Merge "Image size restriction to rd auto partition search."

author paulwilkins <paulwilkins@google.com>

Thu, 7 May 2015 14:12:13 +0000 (14:12 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Thu, 7 May 2015 14:12:14 +0000 (14:12 +0000)
author paulwilkins <paulwilkins@google.com>
Thu, 7 May 2015 14:12:13 +0000 (14:12 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 7 May 2015 14:12:14 +0000 (14:12 +0000)
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
diff --cc vp9/encoder/vp9_speed_features.c
Simple merge
diff --cc vp9/encoder/vp9_speed_features.h
Simple merge
author	paulwilkins <paulwilkins@google.com>
	Thu, 7 May 2015 14:12:13 +0000 (14:12 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 7 May 2015 14:12:14 +0000 (14:12 +0000)
		1	2
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_speed_features.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_speed_features.h	patch \|	diff1 \|	diff2 \|	blob \| history