ref: 1bcf4e66bbbc530d7e2321ab98fb75d9a3d2cc69
parent: 814532a33cee261cfc8c14f894c3e7d7677face6
parent: 89c6017cc03082c78c6058db85cd22027230927c
author: Yaowu Xu <yaowu@google.com>
date: Tue May 10 15:59:52 EDT 2011
Merge "fix a bug related to gf_active_flags in multi-threaded encoder"
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -830,6 +830,7 @@
xd->mode_info_context += xd->mode_info_stride * cpi->encoding_thread_count;
x->partition_info += xd->mode_info_stride * cpi->encoding_thread_count;
+ x->gf_active_ptr += cm->mb_cols * cpi->encoding_thread_count;
}
--- a/vp8/encoder/ethreading.c
+++ b/vp8/encoder/ethreading.c
@@ -264,6 +264,7 @@
xd->mode_info_context += xd->mode_info_stride * cpi->encoding_thread_count;
x->partition_info += xd->mode_info_stride * cpi->encoding_thread_count;
+ x->gf_active_ptr += cm->mb_cols * cpi->encoding_thread_count;
if (mb_row == cm->mb_rows - 1)
{
--
⑨