ref: 61d05c1e67371c7468b6e4dbc414bf0c16414e6d
parent: cc04ae1565f784dd138dd49cac743d3094e13106
parent: 86fed469ec1ea5f618b7bdaec2c18f736ac44151
author: Johann Koenig <johannkoenig@google.com>
date: Wed Feb 15 20:00:44 EST 2017
Merge "vp8_dx_iface: remove unused 'else' condition"
--- a/vp8/vp8_dx_iface.c
+++ b/vp8/vp8_dx_iface.c
@@ -80,7 +80,6 @@
static vpx_codec_err_t vp8_init(vpx_codec_ctx_t *ctx,
vpx_codec_priv_enc_mr_cfg_t *data) {
vpx_codec_err_t res = VPX_CODEC_OK;
- vpx_codec_alg_priv_t *priv = NULL;
(void)data;
vp8_rtcd();
@@ -92,7 +91,10 @@
* information becomes known.
*/
if (!ctx->priv) {
+ vpx_codec_alg_priv_t *priv;
+
if (vp8_init_ctx(ctx)) return VPX_CODEC_MEM_ERROR;
+
priv = (vpx_codec_alg_priv_t *)ctx->priv;
/* initialize number of fragments to zero */
@@ -102,8 +104,6 @@
(priv->base.init_flags & VPX_CODEC_USE_INPUT_FRAGMENTS);
/*post processing level initialized to do nothing */
- } else {
- priv = (vpx_codec_alg_priv_t *)ctx->priv;
}
return res;