Merge "Put more code under #if CONFIG_MULTITHREAD."

author John Koleszar <jkoleszar@google.com>

Wed, 9 Feb 2011 16:31:36 +0000 (08:31 -0800)

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

Wed, 9 Feb 2011 16:31:36 +0000 (08:31 -0800)
author John Koleszar <jkoleszar@google.com>
Wed, 9 Feb 2011 16:31:36 +0000 (08:31 -0800)
committer Code Review <code-review@webmproject.org>
Wed, 9 Feb 2011 16:31:36 +0000 (08:31 -0800)
diff --cc vp8/decoder/decodframe.c
Simple merge
diff --cc vp8/decoder/onyxd_int.h
Simple merge
diff --cc vp8/encoder/encodeframe.c
Simple merge
author	John Koleszar <jkoleszar@google.com>
	Wed, 9 Feb 2011 16:31:36 +0000 (08:31 -0800)
committer	Code Review <code-review@webmproject.org>
	Wed, 9 Feb 2011 16:31:36 +0000 (08:31 -0800)
		1	2
vp8/decoder/decodframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/decoder/onyxd_int.h	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history