Merge "vp9_firstpass: Get rid of magic number in bits per MB calculation"

author Yaowu Xu <yaowu@google.com>

Tue, 8 Apr 2014 14:13:49 +0000 (07:13 -0700)

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

Tue, 8 Apr 2014 14:13:49 +0000 (07:13 -0700)
author Yaowu Xu <yaowu@google.com>
Tue, 8 Apr 2014 14:13:49 +0000 (07:13 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 8 Apr 2014 14:13:49 +0000 (07:13 -0700)
diff --cc vp9/encoder/vp9_firstpass.c
Simple merge
diff --cc vp9/encoder/vp9_ratectrl.c
Simple merge
diff --cc vp9/encoder/vp9_ratectrl.h
Simple merge
author	Yaowu Xu <yaowu@google.com>
	Tue, 8 Apr 2014 14:13:49 +0000 (07:13 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Tue, 8 Apr 2014 14:13:49 +0000 (07:13 -0700)
		1	2
vp9/encoder/vp9_firstpass.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_ratectrl.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_ratectrl.h	patch \|	diff1 \|	diff2 \|	blob \| history