From 2e0588bc46b073d8bf65600facdcb31d6876d531 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Wed, 9 Jul 2014 11:08:06 -0700
Subject: [PATCH] vp9_decoder_remove: destroy common after thread shutdown
in a failure case the threads may still be running and share a reference
to VP9_COMMON
Change-Id: I867034b4b55f133663b8cbf6ca06e72acf952849
---
vp9/decoder/vp9_decoder.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vp9/decoder/vp9_decoder.c b/vp9/decoder/vp9_decoder.c
index d154e9d815..a0bd2f1241 100644
--- a/vp9/decoder/vp9_decoder.c
+++ b/vp9/decoder/vp9_decoder.c
@@ -85,7 +85,6 @@ void vp9_decoder_remove(VP9Decoder *pbi) {
VP9_COMMON *const cm = &pbi->common;
int i;
- vp9_remove_common(cm);
vp9_get_worker_interface()->end(&pbi->lf_worker);
vpx_free(pbi->lf_worker.data1);
vpx_free(pbi->tile_data);
@@ -103,6 +102,7 @@ void vp9_decoder_remove(VP9Decoder *pbi) {
vp9_loop_filter_dealloc(&pbi->lf_row_sync, sb_rows);
}
+ vp9_remove_common(cm);
vpx_free(pbi);
}
--
GitLab