ref: 70c9b3c6686660e45c617468e4f6ea103a10c7cb
parent: 9152d434dc5e6f43e1a9ea9a010419fab1b2a4ad
parent: c42a281439dafbc9b31503d3a5e3b8f1fbaec231
author: James Zern <[email protected]>
date: Wed Jan 18 02:36:53 EST 2017
Merge "vp9_cx_iface,encoder_encode: check validate_img return"
--- a/vp9/vp9_cx_iface.c
+++ b/vp9/vp9_cx_iface.c
@@ -1108,7 +1108,7 @@
}
cpi->common.error.setjmp = 1;
- vp9_apply_encoding_flags(cpi, flags);
+ if (res == VPX_CODEC_OK) vp9_apply_encoding_flags(cpi, flags);
// Handle fixed keyframe intervals
if (ctx->cfg.kf_mode == VPX_KF_AUTO &&