Merge "Refactor mbmi->inter_tx_size to 2D array." into nextgenv2

author Debargha Mukherjee <debargha@google.com>

Fri, 18 Mar 2016 23:50:25 +0000 (23:50 +0000)

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

Fri, 18 Mar 2016 23:50:25 +0000 (23:50 +0000)
author Debargha Mukherjee <debargha@google.com>
Fri, 18 Mar 2016 23:50:25 +0000 (23:50 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 18 Mar 2016 23:50:25 +0000 (23:50 +0000)
diff --cc vp10/encoder/bitstream.c
Simple merge
diff --cc vp10/encoder/rdopt.c
Simple merge
author	Debargha Mukherjee <debargha@google.com>
	Fri, 18 Mar 2016 23:50:25 +0000 (23:50 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 18 Mar 2016 23:50:25 +0000 (23:50 +0000)
		1	2
vp10/encoder/bitstream.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history