Merge "vp9: move encoder-only member from common"

author James Zern <jzern@google.com>

Fri, 12 Dec 2014 22:28:55 +0000 (14:28 -0800)

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

Fri, 12 Dec 2014 22:28:55 +0000 (14:28 -0800)
author James Zern <jzern@google.com>
Fri, 12 Dec 2014 22:28:55 +0000 (14:28 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 12 Dec 2014 22:28:55 +0000 (14:28 -0800)
diff --cc vp9/common/vp9_onyxc_int.h
Simple merge
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
author	James Zern <jzern@google.com>
	Fri, 12 Dec 2014 22:28:55 +0000 (14:28 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Fri, 12 Dec 2014 22:28:55 +0000 (14:28 -0800)
		1	2
vp9/common/vp9_onyxc_int.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history