summaryrefslogtreecommitdiff
path: root/vp10/encoder/encoder.c
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2015-09-23 17:55:51 -0700
committerJames Zern <jzern@google.com>2015-09-23 17:55:51 -0700
commitcf8f6559ce1b99df99bcda87a0f4d6ec5e29d571 (patch)
tree066ef174ee6117d007c5325d94886d843b01c989 /vp10/encoder/encoder.c
parentaf631e1f1959cf4961e1abeb7f547d6a9114fbcd (diff)
downloadlibvpx-cf8f6559ce1b99df99bcda87a0f4d6ec5e29d571.tar
libvpx-cf8f6559ce1b99df99bcda87a0f4d6ec5e29d571.tar.gz
libvpx-cf8f6559ce1b99df99bcda87a0f4d6ec5e29d571.tar.bz2
libvpx-cf8f6559ce1b99df99bcda87a0f4d6ec5e29d571.zip
vp9/10 encoder: prevent NULL access on failure
Change-Id: I1fc8e0b3d48675cd5428b7b36f7cc28ab32cbf71
Diffstat (limited to 'vp10/encoder/encoder.c')
-rw-r--r--vp10/encoder/encoder.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/vp10/encoder/encoder.c b/vp10/encoder/encoder.c
index 6ae4c5ebe..d5545a090 100644
--- a/vp10/encoder/encoder.c
+++ b/vp10/encoder/encoder.c
@@ -1820,14 +1820,15 @@ VP10_COMP *vp10_create_compressor(VP10EncoderConfig *oxcf,
snprintf((H) + strlen(H), sizeof(H) - strlen(H), (T), (V))
void vp10_remove_compressor(VP10_COMP *cpi) {
- VP10_COMMON *const cm = &cpi->common;
+ VP10_COMMON *cm;
unsigned int i;
int t;
if (!cpi)
return;
- if (cpi && (cm->current_video_frame > 0)) {
+ cm = &cpi->common;
+ if (cm->current_video_frame > 0) {
#if CONFIG_INTERNAL_STATS
vpx_clear_system_state();