Merge "vp9_decoder_remove: destroy common after thread shutdown"

2d8339ee · James Zern · Gerrit Code Review · a581da21 · 2e0588bc · 2d8339ee
Commit 2d8339ee authored Jul 09, 2014 by James Zern Committed by Gerrit Code Review Jul 09, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

vp9/decoder/vp9_decoder.c vp9/decoder/vp9_decoder.c +1 -1

No files found.
--- 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);
 }