diff options
| author | James Zern <jzern@google.com> | 2016-02-17 12:36:49 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2016-02-17 12:36:49 -0800 |
| commit | 7997c68ed43634606985a255d28fc4a9879a5f27 (patch) | |
| tree | 4b178d9cc065b7fb27876a72e918b4dc515c2914 | |
| parent | fdc977afc6b431c7577e70d151f89ea726bcaf8f (diff) | |
| download | libvpx-7997c68ed43634606985a255d28fc4a9879a5f27.tar libvpx-7997c68ed43634606985a255d28fc4a9879a5f27.tar.gz libvpx-7997c68ed43634606985a255d28fc4a9879a5f27.tar.bz2 libvpx-7997c68ed43634606985a255d28fc4a9879a5f27.zip | |
vp9_cyclic_refresh_alloc: correct cleanup on error
previously only the CYCLIC_REFRESH allocation was being freed
Change-Id: I6e1783d077c5ca83c8d62ea9642f1fb03f2e5bf3
| -rw-r--r-- | vp9/encoder/vp9_aq_cyclicrefresh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_aq_cyclicrefresh.c b/vp9/encoder/vp9_aq_cyclicrefresh.c index b7cfdf6bf..0a02bde99 100644 --- a/vp9/encoder/vp9_aq_cyclicrefresh.c +++ b/vp9/encoder/vp9_aq_cyclicrefresh.c @@ -30,13 +30,13 @@ CYCLIC_REFRESH *vp9_cyclic_refresh_alloc(int mi_rows, int mi_cols) { cr->map = vpx_calloc(mi_rows * mi_cols, sizeof(*cr->map)); if (cr->map == NULL) { - vpx_free(cr); + vp9_cyclic_refresh_free(cr); return NULL; } last_coded_q_map_size = mi_rows * mi_cols * sizeof(*cr->last_coded_q_map); cr->last_coded_q_map = vpx_malloc(last_coded_q_map_size); if (cr->last_coded_q_map == NULL) { - vpx_free(cr); + vp9_cyclic_refresh_free(cr); return NULL; } assert(MAXQ <= 255); @@ -45,7 +45,7 @@ CYCLIC_REFRESH *vp9_cyclic_refresh_alloc(int mi_rows, int mi_cols) { consec_zero_mv_size = mi_rows * mi_cols * sizeof(*cr->consec_zero_mv); cr->consec_zero_mv = vpx_malloc(consec_zero_mv_size); if (cr->consec_zero_mv == NULL) { - vpx_free(cr); + vp9_cyclic_refresh_free(cr); return NULL; } memset(cr->consec_zero_mv, 0, consec_zero_mv_size); |