Merge "Refactoring and cosmetic changes to ext-inter expt" into nextgenv2

author Debargha Mukherjee <debargha@google.com>

Wed, 6 Apr 2016 01:19:05 +0000 (01:19 +0000)

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

Wed, 6 Apr 2016 01:19:06 +0000 (01:19 +0000)
author Debargha Mukherjee <debargha@google.com>
Wed, 6 Apr 2016 01:19:05 +0000 (01:19 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 6 Apr 2016 01:19:06 +0000 (01:19 +0000)
diff --cc vp10/common/blockd.h
Simple merge
diff --cc vp10/decoder/decodeframe.c
Simple merge
diff --cc vp10/encoder/bitstream.c
Simple merge
diff --cc vp10/encoder/encodeframe.c
Simple merge
author	Debargha Mukherjee <debargha@google.com>
	Wed, 6 Apr 2016 01:19:05 +0000 (01:19 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 6 Apr 2016 01:19:06 +0000 (01:19 +0000)
		1	2
vp10/common/blockd.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/decoder/decodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/bitstream.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history