Merge "Replace arbitrary number with defs" into nextgenv2

author Jingning Han <jingning@google.com>

Wed, 10 Feb 2016 16:50:04 +0000 (16:50 +0000)

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

Wed, 10 Feb 2016 16:50:05 +0000 (16:50 +0000)
author Jingning Han <jingning@google.com>
Wed, 10 Feb 2016 16:50:04 +0000 (16:50 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 10 Feb 2016 16:50:05 +0000 (16:50 +0000)
diff --cc vp10/decoder/decodemv.c
Simple merge
diff --cc vp10/encoder/bitstream.c
Simple merge
diff --cc vp10/encoder/encodeframe.c
Simple merge
author	Jingning Han <jingning@google.com>
	Wed, 10 Feb 2016 16:50:04 +0000 (16:50 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 10 Feb 2016 16:50:05 +0000 (16:50 +0000)
		1	2
vp10/decoder/decodemv.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/bitstream.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history