Merge "Speed setting correction to max q estimate."

author Paul Wilkins <paulwilkins@google.com>

Wed, 2 Apr 2014 11:08:18 +0000 (04:08 -0700)

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

Wed, 2 Apr 2014 11:08:18 +0000 (04:08 -0700)
author Paul Wilkins <paulwilkins@google.com>
Wed, 2 Apr 2014 11:08:18 +0000 (04:08 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 2 Apr 2014 11:08:18 +0000 (04:08 -0700)
diff --cc vp9/encoder/vp9_firstpass.c
Simple merge
diff --cc vp9/encoder/vp9_ratectrl.c
Simple merge
author	Paul Wilkins <paulwilkins@google.com>
	Wed, 2 Apr 2014 11:08:18 +0000 (04:08 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Wed, 2 Apr 2014 11:08:18 +0000 (04:08 -0700)
		1	2
vp9/encoder/vp9_firstpass.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_ratectrl.c	patch \|	diff1 \|	diff2 \|	blob \| history