Merge "Added 3 more reference frames for inter prediction." into nextgenv2

author Zoe Liu <zoeliu@google.com>

Tue, 24 Nov 2015 19:47:03 +0000 (19:47 +0000)

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

Tue, 24 Nov 2015 19:47:03 +0000 (19:47 +0000)
author Zoe Liu <zoeliu@google.com>
Tue, 24 Nov 2015 19:47:03 +0000 (19:47 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 24 Nov 2015 19:47:03 +0000 (19:47 +0000)
diff --cc vp10/common/blockd.h
Simple merge
diff --cc vp10/common/onyxc_int.h
Simple merge
diff --cc vp10/encoder/rdopt.c
Simple merge
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
author	Zoe Liu <zoeliu@google.com>
	Tue, 24 Nov 2015 19:47:03 +0000 (19:47 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 24 Nov 2015 19:47:03 +0000 (19:47 +0000)
		1	2
vp10/common/blockd.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/common/onyxc_int.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history