Merge "Move variance functions to vpx_dsp"

author Johann <johannkoenig@google.com>

Tue, 26 May 2015 23:02:10 +0000 (23:02 +0000)

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

Tue, 26 May 2015 23:02:11 +0000 (23:02 +0000)
author Johann <johannkoenig@google.com>
Tue, 26 May 2015 23:02:10 +0000 (23:02 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 26 May 2015 23:02:11 +0000 (23:02 +0000)
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
diff --cc vp9/encoder/vp9_encoder.c
Simple merge
diff --cc vp9/encoder/vp9_firstpass.c
Simple merge
diff --cc vp9/encoder/vp9_mcomp.c
Simple merge
diff --cc vp9/encoder/vp9_pickmode.c
Simple merge
author	Johann <johannkoenig@google.com>
	Tue, 26 May 2015 23:02:10 +0000 (23:02 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 26 May 2015 23:02:11 +0000 (23:02 +0000)
		1	2
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_encoder.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_firstpass.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_mcomp.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_pickmode.c	patch \|	diff1 \|	diff2 \|	blob \| history