Merge "fix a bug related to gf_active_flags in multi-threaded encoder"

author Yaowu Xu <yaowu@google.com>

Wed, 11 May 2011 02:59:52 +0000 (19:59 -0700)

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

Wed, 11 May 2011 02:59:52 +0000 (19:59 -0700)
author Yaowu Xu <yaowu@google.com>
Wed, 11 May 2011 02:59:52 +0000 (19:59 -0700)
committer Code Review <code-review@webmproject.org>
Wed, 11 May 2011 02:59:52 +0000 (19:59 -0700)
diff --cc vp8/encoder/encodeframe.c
Simple merge
diff --cc vp8/encoder/ethreading.c
Simple merge
author	Yaowu Xu <yaowu@google.com>
	Wed, 11 May 2011 02:59:52 +0000 (19:59 -0700)
committer	Code Review <code-review@webmproject.org>
	Wed, 11 May 2011 02:59:52 +0000 (19:59 -0700)
		1	2
vp8/encoder/encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/ethreading.c	patch \|	diff1 \|	diff2 \|	blob \| history