Merge "VP10: some changes to palette mode"

author Hui Su <huisu@google.com>

Tue, 20 Oct 2015 16:37:31 +0000 (16:37 +0000)

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

Tue, 20 Oct 2015 16:37:31 +0000 (16:37 +0000)
author Hui Su <huisu@google.com>
Tue, 20 Oct 2015 16:37:31 +0000 (16:37 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 20 Oct 2015 16:37:31 +0000 (16:37 +0000)
diff --cc vp10/common/entropymode.c
Simple merge
diff --cc vp10/encoder/bitstream.c
Simple merge
diff --cc vp10/encoder/encoder.h
Simple merge
diff --cc vp10/encoder/rd.c
Simple merge
diff --cc vp10/encoder/rdopt.c
Simple merge
author	Hui Su <huisu@google.com>
	Tue, 20 Oct 2015 16:37:31 +0000 (16:37 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 20 Oct 2015 16:37:31 +0000 (16:37 +0000)
		1	2
vp10/common/entropymode.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/bitstream.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/encoder.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/rd.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history