Merge "Restructure of activity masking code."

author Paul Wilkins <paulwilkins@google.com>

Fri, 13 May 2011 16:23:50 +0000 (09:23 -0700)

committer Code Review <code-review@webmproject.org>

Fri, 13 May 2011 16:23:50 +0000 (09:23 -0700)
author Paul Wilkins <paulwilkins@google.com>
Fri, 13 May 2011 16:23:50 +0000 (09:23 -0700)
committer Code Review <code-review@webmproject.org>
Fri, 13 May 2011 16:23:50 +0000 (09:23 -0700)
diff --cc vp8/encoder/encodeframe.c
Simple merge
diff --cc vp8/encoder/onyx_if.c
Simple merge
author	Paul Wilkins <paulwilkins@google.com>
	Fri, 13 May 2011 16:23:50 +0000 (09:23 -0700)
committer	Code Review <code-review@webmproject.org>
	Fri, 13 May 2011 16:23:50 +0000 (09:23 -0700)
		1	2
vp8/encoder/encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history