ref: e7c949d32d4783004b825485335f9a664b398f59
parent: 040395b9442dc480b1f53d2612765648e57914af
parent: 921c347ef6b67f8ed2f02080d3941cce51d4acbb
author: James Zern <[email protected]>
date: Fri Sep 25 15:31:07 EDT 2015
Merge "vp9/10 decoder_remove: check pbi pointer"
--- a/vp10/decoder/decoder.c
+++ b/vp10/decoder/decoder.c
@@ -126,6 +126,9 @@
void vp10_decoder_remove(VP10Decoder *pbi) {
int i;
+ if (!pbi)
+ return;
+
vpx_get_worker_interface()->end(&pbi->lf_worker);
vpx_free(pbi->lf_worker.data1);
vpx_free(pbi->tile_data);
--- a/vp9/decoder/vp9_decoder.c
+++ b/vp9/decoder/vp9_decoder.c
@@ -126,6 +126,9 @@
void vp9_decoder_remove(VP9Decoder *pbi) {
int i;
+ if (!pbi)
+ return;
+
vpx_get_worker_interface()->end(&pbi->lf_worker);
vpx_free(pbi->lf_worker.data1);
vpx_free(pbi->tile_data);