summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorhkuang <hkuang@google.com>2014-06-28 10:19:35 -0700
committerhkuang <hkuang@google.com>2014-06-30 10:45:50 -0700
commit34b2ce15f95ee0944ebe6d569e7a9179a7e4cc5b (patch)
treee0db1739effd2764a88ee3ddc0ba28e1916e24d9 /vp9
parent9d41313e4bd28d3c504c26079cbe4a499e7eceb7 (diff)
downloadlibvpx-34b2ce15f95ee0944ebe6d569e7a9179a7e4cc5b.tar
libvpx-34b2ce15f95ee0944ebe6d569e7a9179a7e4cc5b.tar.gz
libvpx-34b2ce15f95ee0944ebe6d569e7a9179a7e4cc5b.tar.bz2
libvpx-34b2ce15f95ee0944ebe6d569e7a9179a7e4cc5b.zip
Fix a bug in VP9Worker which leads to unit test hang.
This fixes the hang in VP9/InvalidFileTest.ReturnCode/3 due to worker->had_error has not been reset after getting error. Change-Id: Ia3608225094758a2bd88f6ae4dd9dfd93bbaad27
Diffstat (limited to 'vp9')
-rw-r--r--vp9/decoder/vp9_thread.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/vp9/decoder/vp9_thread.c b/vp9/decoder/vp9_thread.c
index 5d31d3d98..4ea9c17d8 100644
--- 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);
}