Merge "Remove "update_context" variable from VP9_COMP context." into experimental

author Ronald S. Bultje <rbultje@google.com>

Fri, 25 Jan 2013 17:43:42 +0000 (09:43 -0800)

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

Fri, 25 Jan 2013 17:43:42 +0000 (09:43 -0800)
author Ronald S. Bultje <rbultje@google.com>
Fri, 25 Jan 2013 17:43:42 +0000 (09:43 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 25 Jan 2013 17:43:42 +0000 (09:43 -0800)
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
author	Ronald S. Bultje <rbultje@google.com>
	Fri, 25 Jan 2013 17:43:42 +0000 (09:43 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Fri, 25 Jan 2013 17:43:42 +0000 (09:43 -0800)
		1	2
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history