Merge "Code cleanup." into experimental

author John Koleszar <jkoleszar@google.com>

Tue, 2 Apr 2013 04:12:56 +0000 (21:12 -0700)

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

Tue, 2 Apr 2013 04:12:56 +0000 (21:12 -0700)
author John Koleszar <jkoleszar@google.com>
Tue, 2 Apr 2013 04:12:56 +0000 (21:12 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 2 Apr 2013 04:12:56 +0000 (21:12 -0700)
diff --cc vp9/decoder/vp9_decodframe.c
Simple merge
diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge
author	John Koleszar <jkoleszar@google.com>
	Tue, 2 Apr 2013 04:12:56 +0000 (21:12 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Tue, 2 Apr 2013 04:12:56 +0000 (21:12 -0700)
		1	2
vp9/decoder/vp9_decodframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history