Merge "Add a speed feature for intra filter search" into nextgenv2

author Hui Su <huisu@google.com>

Fri, 5 Feb 2016 18:49:24 +0000 (18:49 +0000)

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

Fri, 5 Feb 2016 18:49:24 +0000 (18:49 +0000)
author Hui Su <huisu@google.com>
Fri, 5 Feb 2016 18:49:24 +0000 (18:49 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 5 Feb 2016 18:49:24 +0000 (18:49 +0000)
diff --cc vp10/common/blockd.h
Simple merge
diff --cc vp10/encoder/rdopt.c
Simple merge
author	Hui Su <huisu@google.com>
	Fri, 5 Feb 2016 18:49:24 +0000 (18:49 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 5 Feb 2016 18:49:24 +0000 (18:49 +0000)
		1	2
vp10/common/blockd.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history