Commit db2056f3 authored by James Zern's avatar James Zern Committed by Gerrit Code Review

Merge "vp9/10 encoder: prevent NULL access on failure"

parents fcd6414e cf8f6559
......@@ -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();
......
......@@ -1930,14 +1930,15 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf,
snprintf((H) + strlen(H), sizeof(H) - strlen(H), (T), (V))
void vp9_remove_compressor(VP9_COMP *cpi) {
VP9_COMMON *const cm = &cpi->common;
VP9_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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment