Merge "Revert "Remove Wextra warnings from vp9_sad.c""

author Jim Bankoski <jimbankoski@google.com>

Thu, 15 May 2014 18:54:23 +0000 (11:54 -0700)

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

Thu, 15 May 2014 18:54:23 +0000 (11:54 -0700)
author Jim Bankoski <jimbankoski@google.com>
Thu, 15 May 2014 18:54:23 +0000 (11:54 -0700)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 15 May 2014 18:54:23 +0000 (11:54 -0700)
diff --cc vp8/common/rtcd_defs.pl
Simple merge
diff --cc vp9/common/vp9_rtcd_defs.pl
Simple merge
diff --cc vp9/encoder/vp9_mbgraph.c
Simple merge
diff --cc vp9/encoder/vp9_mcomp.c
Simple merge
diff --cc vp9/encoder/vp9_rdopt.c
Simple merge
author	Jim Bankoski <jimbankoski@google.com>
	Thu, 15 May 2014 18:54:23 +0000 (11:54 -0700)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Thu, 15 May 2014 18:54:23 +0000 (11:54 -0700)
		1	2
vp8/common/rtcd_defs.pl	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/common/vp9_rtcd_defs.pl	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_mbgraph.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_mcomp.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history