From: Alex Converse <aconverse@google.com>
Date: Tue, 24 Jun 2014 01:25:51 +0000 (-0700)
Subject: Merge "Switch active map implementation to segment based."
X-Git-Tag: v1.4.0~1354
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2518e33bec555d88a3ea0f56b2d2f402e7f07bdf;p=libvpx

Merge "Switch active map implementation to segment based."
---

2518e33bec555d88a3ea0f56b2d2f402e7f07bdf
diff --cc vp9/encoder/vp9_encoder.c
index bc240ff55,250252702..7eeb644f2
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@@ -174,11 -176,7 +174,8 @@@ static void dealloc_compressor_data(VP9
    vp9_cyclic_refresh_free(cpi->cyclic_refresh);
    cpi->cyclic_refresh = NULL;
  
-   vpx_free(cpi->active_map);
-   cpi->active_map = NULL;
- 
    vp9_free_frame_buffers(cm);
 +  vp9_free_context_buffers(cm);
  
    vp9_free_frame_buffer(&cpi->last_frame_uf);
    vp9_free_frame_buffer(&cpi->scaled_source);