libvpx: Pull from upstream

source/libvpx/vpx/src/vpx_encoder.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 35 matching lines @@
     ctx->name = iface->name;
     ctx->priv = NULL;
     ctx->init_flags = flags;
     ctx->config.enc = cfg;
     res = ctx->iface->init(ctx, NULL);
 
     if (res) {
       ctx->err_detail = ctx->priv ? ctx->priv->err_detail : NULL;
       vpx_codec_destroy(ctx);
     }
-
-    if (ctx->priv)
-      ctx->priv->iface = ctx->iface;
   }
 
   return SAVE_STATUS(ctx, res);
 }
 
 vpx_codec_err_t vpx_codec_enc_init_multi_ver(vpx_codec_ctx_t      *ctx,
                                              vpx_codec_iface_t    *iface,
                                              vpx_codec_enc_cfg_t  *cfg,
                                              int                   num_enc,
                                              vpx_codec_flags_t     flags,
@@ skipping 59 matching lines @@
 
           /* Destroy already allocated high-level ctx */
           while (i) {
             ctx--;
             ctx->err_detail = error_detail;
             vpx_codec_destroy(ctx);
             i--;
           }
         }
 
-        if (ctx->priv)
-          ctx->priv->iface = ctx->iface;
-
         if (res)
           break;
 
         ctx++;
         cfg++;
         dsf++;
       }
       ctx--;
     }
   }
@@ skipping 243 matching lines @@
 
   pkt = (const vpx_codec_cx_pkt_t *)*iter;
 
   if ((size_t)(pkt - list->pkts) < list->cnt)
     *iter = pkt + 1;
   else
     pkt = NULL;
 
   return pkt;
 }