Merge "Reimplementation of setup_frame_size." into experimental

author John Koleszar <jkoleszar@google.com>

Thu, 4 Apr 2013 04:04:29 +0000 (21:04 -0700)

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

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