Merge "Creates a new speed 1:" into experimental

author Jim Bankoski <jimbankoski@google.com>

Fri, 31 May 2013 03:36:05 +0000 (20:36 -0700)

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

Fri, 31 May 2013 03:36:05 +0000 (20:36 -0700)
author Jim Bankoski <jimbankoski@google.com>
Fri, 31 May 2013 03:36:05 +0000 (20:36 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 31 May 2013 03:36:05 +0000 (20:36 -0700)
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
author	Jim Bankoski <jimbankoski@google.com>
	Fri, 31 May 2013 03:36:05 +0000 (20:36 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Fri, 31 May 2013 03:36:05 +0000 (20:36 -0700)
		1	2
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history