Merge "Reduce overshoot in 1 pass rate control"

author John Koleszar <jkoleszar@google.com>

Tue, 7 Jun 2011 19:30:37 +0000 (12:30 -0700)

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

Tue, 7 Jun 2011 19:30:37 +0000 (12:30 -0700)
author John Koleszar <jkoleszar@google.com>
Tue, 7 Jun 2011 19:30:37 +0000 (12:30 -0700)
committer Code Review <code-review@webmproject.org>
Tue, 7 Jun 2011 19:30:37 +0000 (12:30 -0700)
diff --cc vp8/encoder/firstpass.c
Simple merge
diff --cc vp8/encoder/onyx_if.c
Simple merge
author	John Koleszar <jkoleszar@google.com>
	Tue, 7 Jun 2011 19:30:37 +0000 (12:30 -0700)
committer	Code Review <code-review@webmproject.org>
	Tue, 7 Jun 2011 19:30:37 +0000 (12:30 -0700)
		1	2
vp8/encoder/firstpass.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history