Merge "Move PSNR related functions into vpx_dsp/psnr.c" into nextgenv2

author Yaowu Xu <yaowu@google.com>

Thu, 18 Feb 2016 01:00:54 +0000 (01:00 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Thu, 18 Feb 2016 01:00:54 +0000 (01:00 +0000)
author Yaowu Xu <yaowu@google.com>
Thu, 18 Feb 2016 01:00:54 +0000 (01:00 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 18 Feb 2016 01:00:54 +0000 (01:00 +0000)
diff --cc vp10/encoder/encoder.c
Simple merge
diff --cc vp10/encoder/encoder.h
Simple merge
diff --cc vp9/encoder/vp9_encoder.c
Simple merge
diff --cc vpx_dsp/vpx_dsp.mk
Simple merge
author	Yaowu Xu <yaowu@google.com>
	Thu, 18 Feb 2016 01:00:54 +0000 (01:00 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 18 Feb 2016 01:00:54 +0000 (01:00 +0000)
		1	2
vp10/encoder/encoder.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/encoder.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_encoder.c	patch \|	diff1 \|	diff2 \|	blob \| history
vpx_dsp/vpx_dsp.mk	patch \|	diff1 \|	diff2 \|	blob \| history