Merge "Enable rectangular support for comp inter-intra" into experimental

author Jingning Han <jingning@google.com>

Wed, 24 Apr 2013 00:16:16 +0000 (17:16 -0700)

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

Wed, 24 Apr 2013 00:16:16 +0000 (17:16 -0700)
author Jingning Han <jingning@google.com>
Wed, 24 Apr 2013 00:16:16 +0000 (17:16 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 24 Apr 2013 00:16:16 +0000 (17:16 -0700)
diff --cc vp9/common/vp9_reconintra.c
Simple merge
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
author	Jingning Han <jingning@google.com>
	Wed, 24 Apr 2013 00:16:16 +0000 (17:16 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Wed, 24 Apr 2013 00:16:16 +0000 (17:16 -0700)
		1	2
vp9/common/vp9_reconintra.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history