libvpx: Pull from upstream

source/libvpx/vpx/vp8dx.h

Index: source/libvpx/vpx/vp8dx.h
===================================================================
--- source/libvpx/vpx/vp8dx.h	(revision 232227)
+++ source/libvpx/vpx/vp8dx.h	(working copy)
@@ -22,8 +22,11 @@
  */
 #ifndef VP8DX_H
 #define VP8DX_H
-#include "vpx_codec_impl_top.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*!\name Algorithm interface for VP8
  *
  * This interface provides the capability to decode raw VP8 streams, as would
@@ -42,7 +45,8 @@
 #include "vp8.h"
 
 
-/*!\brief VP8 decoder control functions
+/*!\enum vp8_dec_control_id
+ * \brief VP8 decoder control functions
  *
  * This set of macros define the control functions available for the VP8
  * decoder interface.
@@ -75,12 +79,17 @@
   VP8_DECODER_CTRL_ID_MAX
 };
 
+/*!\brief Structure to hold decryption state
+ *
+ * Defines a structure to hold the decryption state and access function.
+ */
 typedef struct vp8_decrypt_init {
     /** Decrypt n bytes of data from input -> output, using the decrypt_state
      *  passed in VP8D_SET_DECRYPTOR.
      */
     void (*decrypt_cb)(void *decrypt_state, const unsigned char *input,
                        unsigned char *output, int count);
+    /*! Decryption state. */
     void *decrypt_state;
 } vp8_decrypt_init;
 
@@ -100,6 +109,8 @@
 
 /*! @} - end defgroup vp8_decoder */
 
+#ifdef __cplusplus
+}  // extern "C"
+#endif
 
-#include "vpx_codec_impl_bottom.h"
 #endif