Merge "simp-mv-pred integration with ref-mv" into nextgenv2

author Yaowu Xu <yaowu@google.com>

Sun, 30 Oct 2016 19:54:41 +0000 (19:54 +0000)

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

Sun, 30 Oct 2016 19:54:41 +0000 (19:54 +0000)
author Yaowu Xu <yaowu@google.com>
Sun, 30 Oct 2016 19:54:41 +0000 (19:54 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Sun, 30 Oct 2016 19:54:41 +0000 (19:54 +0000)
diff --cc av1/decoder/decodeframe.c
Simple merge
diff --cc av1/encoder/encodeframe.c
Simple merge
diff --cc configure
Simple merge
author	Yaowu Xu <yaowu@google.com>
	Sun, 30 Oct 2016 19:54:41 +0000 (19:54 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Sun, 30 Oct 2016 19:54:41 +0000 (19:54 +0000)
		1	2
av1/decoder/decodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
av1/encoder/encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history