Merge "Removed cpi->target_bits_per_mb"

author Scott LaVarnway <slavarnway@google.com>

Fri, 7 Jan 2011 14:46:45 +0000 (06:46 -0800)

committer Code Review <code-review@webmproject.org>

Fri, 7 Jan 2011 14:46:45 +0000 (06:46 -0800)
author Scott LaVarnway <slavarnway@google.com>
Fri, 7 Jan 2011 14:46:45 +0000 (06:46 -0800)
committer Code Review <code-review@webmproject.org>
Fri, 7 Jan 2011 14:46:45 +0000 (06:46 -0800)
diff --cc vp8/encoder/onyx_if.c
Simple merge
diff --cc vp8/encoder/onyx_int.h
Simple merge
author	Scott LaVarnway <slavarnway@google.com>
	Fri, 7 Jan 2011 14:46:45 +0000 (06:46 -0800)
committer	Code Review <code-review@webmproject.org>
	Fri, 7 Jan 2011 14:46:45 +0000 (06:46 -0800)
		1	2
vp8/encoder/onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/onyx_int.h	patch \|	diff1 \|	diff2 \|	blob \| history