Merge "Fix a bug in VP9Worker which leads to unit test hang."

f8476424 · hkuang · Gerrit Code Review · dee5782f · 34b2ce15 · f8476424
Commit f8476424 authored Jun 30, 2014 by hkuang Committed by Gerrit Code Review Jun 30, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

vp9/decoder/vp9_thread.c vp9/decoder/vp9_thread.c +1 -0

No files found.
--- a/vp9/decoder/vp9_thread.c
+++ b/vp9/decoder/vp9_thread.c
@@ -107,6 +107,7 @@ int vp9_worker_reset(VP9Worker* const worker) {
 }

 void vp9_worker_execute(VP9Worker* const worker) {
+  worker->had_error = 0;
  if (worker->hook != NULL) {
    worker->had_error |= !worker->hook(worker->data1, worker->data2);
  }