Merge "Properly set rate_nocoef when pallete mode is used" into nextgenv2

author Yaowu Xu <yaowu@google.com>

Mon, 21 Mar 2016 20:44:17 +0000 (20:44 +0000)

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

Mon, 21 Mar 2016 20:44:17 +0000 (20:44 +0000)
author Yaowu Xu <yaowu@google.com>
Mon, 21 Mar 2016 20:44:17 +0000 (20:44 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 21 Mar 2016 20:44:17 +0000 (20:44 +0000)
diff --cc vp10/encoder/encodeframe.c
Simple merge
diff --cc vp10/encoder/rdopt.c
Simple merge
author	Yaowu Xu <yaowu@google.com>
	Mon, 21 Mar 2016 20:44:17 +0000 (20:44 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 21 Mar 2016 20:44:17 +0000 (20:44 +0000)
		1	2
vp10/encoder/encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history