libvpx: Pull from upstream

source/libvpx/vp9/decoder/vp9_decoder.h

Index: source/libvpx/vp9/decoder/vp9_decoder.h
===================================================================
--- source/libvpx/vp9/decoder/vp9_decoder.h	(revision 291087)
+++ source/libvpx/vp9/decoder/vp9_decoder.h	(working copy)
@@ -78,6 +78,25 @@
 
 void vp9_decoder_remove(struct VP9Decoder *pbi);
 
+static INLINE uint8_t read_marker(vpx_decrypt_cb decrypt_cb,
+                                  void *decrypt_state,
+                                  const uint8_t *data) {
+  if (decrypt_cb) {
+    uint8_t marker;
+    decrypt_cb(decrypt_state, data, &marker, 1);
+    return marker;
+  }
+  return *data;
+}
+
+// This function is exposed for use in tests, as well as the inlined function
+// "read_marker".
+vpx_codec_err_t vp9_parse_superframe_index(const uint8_t *data,
+                                           size_t data_sz,
+                                           uint32_t sizes[8], int *count,
+                                           vpx_decrypt_cb decrypt_cb,
+                                           void *decrypt_state);
+
 #ifdef __cplusplus
 }  // extern "C"
 #endif