Merge "Using single struct to represent scale factors."

author Dmitry Kovalev <dkovalev@google.com>

Fri, 20 Dec 2013 19:22:02 +0000 (11:22 -0800)

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

Fri, 20 Dec 2013 19:22:02 +0000 (11:22 -0800)
author Dmitry Kovalev <dkovalev@google.com>
Fri, 20 Dec 2013 19:22:02 +0000 (11:22 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 20 Dec 2013 19:22:02 +0000 (11:22 -0800)
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
author	Dmitry Kovalev <dkovalev@google.com>
	Fri, 20 Dec 2013 19:22:02 +0000 (11:22 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Fri, 20 Dec 2013 19:22:02 +0000 (11:22 -0800)
		1	2
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history