Merge "Add a new control of max bitrate for inter frame"

author Yaowu Xu <yaowu@google.com>

Mon, 27 Oct 2014 15:11:54 +0000 (08:11 -0700)

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

Mon, 27 Oct 2014 15:11:54 +0000 (08:11 -0700)
author Yaowu Xu <yaowu@google.com>
Mon, 27 Oct 2014 15:11:54 +0000 (08:11 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 27 Oct 2014 15:11:54 +0000 (08:11 -0700)
diff --cc vp9/encoder/vp9_encoder.h
Simple merge
diff --cc vp9/encoder/vp9_ratectrl.c
Simple merge
author	Yaowu Xu <yaowu@google.com>
	Mon, 27 Oct 2014 15:11:54 +0000 (08:11 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Mon, 27 Oct 2014 15:11:54 +0000 (08:11 -0700)
		1	2
vp9/encoder/vp9_encoder.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_ratectrl.c	patch \|	diff1 \|	diff2 \|	blob \| history