summaryrefslogtreecommitdiff
path: root/vp9/decoder
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2014-07-09 11:08:06 -0700
committerJames Zern <jzern@google.com>2014-07-09 11:08:06 -0700
commit2e0588bc46b073d8bf65600facdcb31d6876d531 (patch)
tree99da6ed9c9f007cfc2d784ba67c763423d2d04ef /vp9/decoder
parent8abbd37d21b0e15b3a3120685e3819dc2ac70f09 (diff)
downloadlibvpx-2e0588bc46b073d8bf65600facdcb31d6876d531.tar
libvpx-2e0588bc46b073d8bf65600facdcb31d6876d531.tar.gz
libvpx-2e0588bc46b073d8bf65600facdcb31d6876d531.tar.bz2
libvpx-2e0588bc46b073d8bf65600facdcb31d6876d531.zip
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
Diffstat (limited to 'vp9/decoder')
-rw-r--r--vp9/decoder/vp9_decoder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_decoder.c b/vp9/decoder/vp9_decoder.c
index d154e9d81..a0bd2f124 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);
}