libvpx: Pull from upstream

source/libvpx/vp8/decoder/onyxd_int.h

 /*
  *  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 104 matching lines @@
     MB_OVERLAP *overlaps;
     /* the mb num from which modes and mvs (first partition) are corrupt */
     unsigned int mvs_corrupt_from_mb;
 #endif
     int ec_enabled;
     int ec_active;
     int decoded_key_frame;
     int independent_partitions;
     int frame_corrupt_residual;
 
-    const unsigned char *decrypt_key;
+    vp8_decrypt_cb *decrypt_cb;
+    void *decrypt_state;
 } VP8D_COMP;
 
 int vp8_decode_frame(VP8D_COMP *cpi);
 
 int vp8_create_decoder_instances(struct frame_buffers *fb, VP8D_CONFIG *oxcf);
 int vp8_remove_decoder_instances(struct frame_buffers *fb);
 
 #if CONFIG_DEBUG
 #define CHECK_MEM_ERROR(lval,expr) do {\
         lval = (expr); \
         if(!lval) \
             vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\
                                "Failed to allocate "#lval" at %s:%d", \
                                __FILE__,__LINE__);\
     } while(0)
 #else
 #define CHECK_MEM_ERROR(lval,expr) do {\
         lval = (expr); \
         if(!lval) \
             vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\
                                "Failed to allocate "#lval);\
     } while(0)
 #endif
 
 #endif  // ONYXD_INT_H_