libvpx: Pull from upstream

source/libvpx/vpx/src/vpx_codec.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 70 matching lines @@
 
 
 vpx_codec_err_t vpx_codec_destroy(vpx_codec_ctx_t *ctx) {
   vpx_codec_err_t res;
 
   if (!ctx)
     res = VPX_CODEC_INVALID_PARAM;
   else if (!ctx->iface || !ctx->priv)
     res = VPX_CODEC_ERROR;
   else {
-    if (ctx->priv->alg_priv)
-      ctx->iface->destroy(ctx->priv->alg_priv);
+    ctx->iface->destroy((vpx_codec_alg_priv_t *)ctx->priv);
 
     ctx->iface = NULL;
     ctx->name = NULL;
     ctx->priv = NULL;
     res = VPX_CODEC_OK;
   }
 
   return SAVE_STATUS(ctx, res);
 }
 
@@ skipping 15 matching lines @@
   else {
     vpx_codec_ctrl_fn_map_t *entry;
 
     res = VPX_CODEC_ERROR;
 
     for (entry = ctx->iface->ctrl_maps; entry && entry->fn; entry++) {
       if (!entry->ctrl_id || entry->ctrl_id == ctrl_id) {
         va_list  ap;
 
         va_start(ap, ctrl_id);
-        res = entry->fn(ctx->priv->alg_priv, ap);
+        res = entry->fn((vpx_codec_alg_priv_t *)ctx->priv, ap);
         va_end(ap);
         break;
       }
     }
   }
 
   return SAVE_STATUS(ctx, res);
 }
 
 void vpx_internal_error(struct vpx_internal_error_info *info,
@@ skipping 11 matching lines @@
     info->has_detail = 1;
     va_start(ap, fmt);
     vsnprintf(info->detail, sz - 1, fmt, ap);
     va_end(ap);
     info->detail[sz - 1] = '\0';
   }
 
   if (info->setjmp)
     longjmp(info->jmp, info->error_code);
 }