Merge "Fix high bit-depth loop-filter sse2 compiling issue - part 4"

author Jingning Han <jingning@google.com>

Fri, 27 Feb 2015 17:49:10 +0000 (09:49 -0800)

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

Fri, 27 Feb 2015 17:49:10 +0000 (09:49 -0800)
author Jingning Han <jingning@google.com>
Fri, 27 Feb 2015 17:49:10 +0000 (09:49 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 27 Feb 2015 17:49:10 +0000 (09:49 -0800)
diff --cc vp9/common/x86/vp9_high_loopfilter_intrin_sse2.c
Simple merge
author	Jingning Han <jingning@google.com>
	Fri, 27 Feb 2015 17:49:10 +0000 (09:49 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Fri, 27 Feb 2015 17:49:10 +0000 (09:49 -0800)