Merge "remove macros obfuscating mv costing" into experimental

author Jim Bankoski <jimbankoski@google.com>

Thu, 8 Nov 2012 23:51:21 +0000 (15:51 -0800)

committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>

Thu, 8 Nov 2012 23:51:21 +0000 (15:51 -0800)
author Jim Bankoski <jimbankoski@google.com>
Thu, 8 Nov 2012 23:51:21 +0000 (15:51 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 8 Nov 2012 23:51:21 +0000 (15:51 -0800)
diff --cc vp9/encoder/bitstream.c
Simple merge
diff --cc vp9/encoder/rdopt.c
Simple merge
author	Jim Bankoski <jimbankoski@google.com>
	Thu, 8 Nov 2012 23:51:21 +0000 (15:51 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Thu, 8 Nov 2012 23:51:21 +0000 (15:51 -0800)
		1	2
vp9/encoder/bitstream.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history