Merge "Account context based prob model for motion vector cost estimate" into nextgenv2

author Jingning Han <jingning@google.com>

Mon, 22 Feb 2016 17:37:41 +0000 (17:37 +0000)

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

Mon, 22 Feb 2016 17:37:42 +0000 (17:37 +0000)
author Jingning Han <jingning@google.com>
Mon, 22 Feb 2016 17:37:41 +0000 (17:37 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 22 Feb 2016 17:37:42 +0000 (17:37 +0000)
diff --cc vp10/encoder/encoder.c
Simple merge
diff --cc vp10/encoder/encoder.h
Simple merge
diff --cc vp10/encoder/rdopt.c
Simple merge
author	Jingning Han <jingning@google.com>
	Mon, 22 Feb 2016 17:37:41 +0000 (17:37 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 22 Feb 2016 17:37:42 +0000 (17:37 +0000)
		1	2
vp10/encoder/encoder.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/encoder.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history