Merge "Cleaning up and fixing psnr calculation code."

author Dmitry Kovalev <dkovalev@google.com>

Mon, 13 Jan 2014 18:59:26 +0000 (10:59 -0800)

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

Mon, 13 Jan 2014 18:59:26 +0000 (10:59 -0800)
author Dmitry Kovalev <dkovalev@google.com>
Mon, 13 Jan 2014 18:59:26 +0000 (10:59 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 13 Jan 2014 18:59:26 +0000 (10:59 -0800)
diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge
diff --cc vp9/encoder/vp9_onyx_int.h
Simple merge
author	Dmitry Kovalev <dkovalev@google.com>
	Mon, 13 Jan 2014 18:59:26 +0000 (10:59 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Mon, 13 Jan 2014 18:59:26 +0000 (10:59 -0800)
		1	2
vp9/encoder/vp9_onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_onyx_int.h	patch \|	diff1 \|	diff2 \|	blob \| history