Merge "Make intra predictor reference buffer configurable"

author Jingning Han <jingning@google.com>

Thu, 27 Jun 2013 02:02:02 +0000 (19:02 -0700)

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

Thu, 27 Jun 2013 02:02:02 +0000 (19:02 -0700)
author Jingning Han <jingning@google.com>
Thu, 27 Jun 2013 02:02:02 +0000 (19:02 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 27 Jun 2013 02:02:02 +0000 (19:02 -0700)
diff --cc vp9/common/vp9_reconintra.c
Simple merge
diff --cc vp9/encoder/vp9_encodemb.c
Simple merge
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
author	Jingning Han <jingning@google.com>
	Thu, 27 Jun 2013 02:02:02 +0000 (19:02 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Thu, 27 Jun 2013 02:02:02 +0000 (19:02 -0700)
		1	2
vp9/common/vp9_reconintra.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_encodemb.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history