Merge "Revert "Move CLPF block signals from frame to SB level."" into nextgenv2

author Yaowu Xu <yaowu@google.com>

Fri, 14 Oct 2016 15:39:36 +0000 (15:39 +0000)

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

Fri, 14 Oct 2016 15:39:36 +0000 (15:39 +0000)
author Yaowu Xu <yaowu@google.com>
Fri, 14 Oct 2016 15:39:36 +0000 (15:39 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 14 Oct 2016 15:39:36 +0000 (15:39 +0000)
diff --cc av1/common/enums.h
Simple merge
diff --cc av1/decoder/decodeframe.c
Simple merge
diff --cc av1/encoder/bitstream.c
Simple merge
diff --cc av1/encoder/encoder.c
Simple merge
author	Yaowu Xu <yaowu@google.com>
	Fri, 14 Oct 2016 15:39:36 +0000 (15:39 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 14 Oct 2016 15:39:36 +0000 (15:39 +0000)
		1	2
av1/common/enums.h	patch \|	diff1 \|	diff2 \|	blob \| history
av1/decoder/decodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
av1/encoder/bitstream.c	patch \|	diff1 \|	diff2 \|	blob \| history
av1/encoder/encoder.c	patch \|	diff1 \|	diff2 \|	blob \| history