Merge "multi-res: force Key frame sychronization"

author Yunqing Wang <yunqingwang@google.com>

Tue, 22 May 2012 15:00:12 +0000 (08:00 -0700)

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

Tue, 22 May 2012 15:00:12 +0000 (08:00 -0700)
author Yunqing Wang <yunqingwang@google.com>
Tue, 22 May 2012 15:00:12 +0000 (08:00 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 22 May 2012 15:00:12 +0000 (08:00 -0700)
diff --cc vp8/encoder/onyx_if.c
Simple merge
diff --cc vp8/encoder/pickinter.c
Simple merge
diff --cc vp8/vp8_cx_iface.c
Simple merge
author	Yunqing Wang <yunqingwang@google.com>
	Tue, 22 May 2012 15:00:12 +0000 (08:00 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Tue, 22 May 2012 15:00:12 +0000 (08:00 -0700)
		1	2
vp8/encoder/onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/pickinter.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/vp8_cx_iface.c	patch \|	diff1 \|	diff2 \|	blob \| history