Merge "Add a strict mode for auto_min_max_partition_size feature"

author Yaowu Xu <yaowu@google.com>

Thu, 30 Jan 2014 00:36:06 +0000 (16:36 -0800)

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

Thu, 30 Jan 2014 00:36:06 +0000 (16:36 -0800)
author Yaowu Xu <yaowu@google.com>
Thu, 30 Jan 2014 00:36:06 +0000 (16:36 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 30 Jan 2014 00:36:06 +0000 (16:36 -0800)
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge
diff --cc vp9/encoder/vp9_onyx_int.h
Simple merge
author	Yaowu Xu <yaowu@google.com>
	Thu, 30 Jan 2014 00:36:06 +0000 (16:36 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Thu, 30 Jan 2014 00:36:06 +0000 (16:36 -0800)
		1	2
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_onyx_int.h	patch \|	diff1 \|	diff2 \|	blob \| history