ref: b334bfc32209882f1823ed441b7d962e96e0b6fb
parent: 9dc9f178147b62d1512ccd4a898a0048e30c16bd
parent: 0fd7fc1370c6fd4c5321c1ce5fbfba48a4cc58c0
author: Dmitry Kovalev <[email protected]>
date: Fri May 16 05:45:51 EDT 2014
Merge "Removing redundant decoder_init flag."
--- a/vp9/vp9_dx_iface.c
+++ b/vp9/vp9_dx_iface.c
@@ -32,7 +32,6 @@
vpx_codec_priv_t base;
vpx_codec_dec_cfg_t cfg;
vp9_stream_info_t si;
- int decoder_init;
struct VP9Decoder *pbi;
int postproc_cfg_set;
vp8_postproc_cfg_t postproc_cfg;
@@ -265,12 +264,10 @@
}
// Initialize the decoder instance on the first frame
- if (!ctx->decoder_init) {
+ if (ctx->pbi == NULL) {
init_decoder(ctx);
if (ctx->pbi == NULL)
return VPX_CODEC_ERROR;
-
- ctx->decoder_init = 1;
}
// Set these even if already initialized. The caller may have changed the