Merge "Fix the bug that PVQ commit broke dering" into nextgenv2

author Yaowu Xu <yaowu@google.com>

Tue, 8 Nov 2016 18:00:52 +0000 (18:00 +0000)

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

Tue, 8 Nov 2016 18:00:53 +0000 (18:00 +0000)
author Yaowu Xu <yaowu@google.com>
Tue, 8 Nov 2016 18:00:52 +0000 (18:00 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 8 Nov 2016 18:00:53 +0000 (18:00 +0000)
diff --cc av1/common/blockd.h
Simple merge
diff --cc av1/encoder/bitstream.c
Simple merge
author	Yaowu Xu <yaowu@google.com>
	Tue, 8 Nov 2016 18:00:52 +0000 (18:00 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 8 Nov 2016 18:00:53 +0000 (18:00 +0000)
		1	2
av1/common/blockd.h	patch \|	diff1 \|	diff2 \|	blob \| history
av1/encoder/bitstream.c	patch \|	diff1 \|	diff2 \|	blob \| history