commit 27dad21548253f95a880e52fd0f8fb8a398b72f0
author Yaowu Xu <yaowu@google.com> Mon Feb 14 13:58:12 2011 -0800
committer Code Review <code-review@webmproject.org> Mon Feb 14 13:58:12 2011 -0800
tree b7c657dff618b36b74135e6ca1ab00eb7b5df3b1
parent 404e998eb7dafe370d2208869be29f9fbcaafd49
parent 94d4fee08f1e2bdd6b4b493635f7281491280220

Merge "Improved vp8_rd_pick_intra_mbuv_mode"

vp8/encoder/onyx_if.c

diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index e73e41e..3f787d6 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -262,7 +262,8 @@
 
 void vp8_dealloc_compressor_data(VP8_COMP *cpi)
 {
-    vpx_free(cpi->tplist);
+    if(cpi->tplist!=0)
+        vpx_free(cpi->tplist);
     cpi->tplist = NULL;
 
     // Delete last frame MV storage buffers
@@ -1406,6 +1407,9 @@
         cpi->mt_sync_range = 16;
 #endif
 
+    if(cpi->tplist);
+        vpx_free(cpi->tplist);
+
     CHECK_MEM_ERROR(cpi->tplist, vpx_malloc(sizeof(TOKENLIST) * cpi->common.mb_rows));
 }