Merge "Don't send segment probability updates when the map isn't updated." into nextgenv2

author Alex Converse <aconverse@google.com>

Fri, 19 Aug 2016 16:52:10 +0000 (16:52 +0000)

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

Fri, 19 Aug 2016 16:52:11 +0000 (16:52 +0000)
author Alex Converse <aconverse@google.com>
Fri, 19 Aug 2016 16:52:10 +0000 (16:52 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 19 Aug 2016 16:52:11 +0000 (16:52 +0000)
diff --cc vp10/decoder/decodeframe.c
Simple merge
diff --cc vp10/encoder/bitstream.c
Simple merge
author	Alex Converse <aconverse@google.com>
	Fri, 19 Aug 2016 16:52:10 +0000 (16:52 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 19 Aug 2016 16:52:11 +0000 (16:52 +0000)
		1	2
vp10/decoder/decodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/bitstream.c	patch \|	diff1 \|	diff2 \|	blob \| history