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 107 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, ctrl_id, ap);
+        res = entry->fn(ctx->priv->alg_priv, ap);
         va_end(ap);
         break;
       }
     }
   }
 
   return SAVE_STATUS(ctx, res);
 }
 
 //------------------------------------------------------------------------------
@@ skipping 36 matching lines @@
       cfg.w = si->w;
       cfg.h = si->h;
 
       if (mmaps[i].sz < mem_reqs[i].calc_sz(&cfg, init_flags)) {
         return VPX_CODEC_MEM_ERROR;
       }
     }
   }
   return VPX_CODEC_OK;
 }