Merge "Revert "Force ARNR filtering to be centered on the ARF frame""

author Adrian Grange <agrange@google.com>

Fri, 2 May 2014 15:13:06 +0000 (08:13 -0700)

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

Fri, 2 May 2014 15:13:06 +0000 (08:13 -0700)
author Adrian Grange <agrange@google.com>
Fri, 2 May 2014 15:13:06 +0000 (08:13 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 2 May 2014 15:13:06 +0000 (08:13 -0700)
diff --cc vp9/encoder/vp9_encoder.h
Simple merge
diff --cc vp9/encoder/vp9_temporal_filter.c
Simple merge
author	Adrian Grange <agrange@google.com>
	Fri, 2 May 2014 15:13:06 +0000 (08:13 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Fri, 2 May 2014 15:13:06 +0000 (08:13 -0700)
		1	2
vp9/encoder/vp9_encoder.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_temporal_filter.c	patch \|	diff1 \|	diff2 \|	blob \| history