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

968291f5 · James Zern · Gerrit Code Review · 6c54dbcb · 1480ba6f · 968291f5
Commit 968291f5 authored Jun 30, 2014 by James Zern Committed by Gerrit Code Review Jun 30, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

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

No files found.
--- a/vp9/decoder/vp9_thread.c
+++ b/vp9/decoder/vp9_thread.c
@@ -107,7 +107,6 @@ 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);
  }