diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/third_party/libvpx/source/libvpx/vpx/vp8dx.h | |
parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/third_party/libvpx/source/libvpx/vpx/vp8dx.h')
-rw-r--r-- | chromium/third_party/libvpx/source/libvpx/vpx/vp8dx.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/chromium/third_party/libvpx/source/libvpx/vpx/vp8dx.h b/chromium/third_party/libvpx/source/libvpx/vpx/vp8dx.h index 7d250ccae8e..d3093c48c5d 100644 --- a/chromium/third_party/libvpx/source/libvpx/vpx/vp8dx.h +++ b/chromium/third_party/libvpx/source/libvpx/vpx/vp8dx.h @@ -22,7 +22,10 @@ */ #ifndef VP8DX_H #define VP8DX_H -#include "vpx_codec_impl_top.h" + +#ifdef __cplusplus +extern "C" { +#endif /*!\name Algorithm interface for VP8 * @@ -42,7 +45,8 @@ extern vpx_codec_iface_t *vpx_codec_vp9_dx(void); #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 @@ enum vp8_dec_control_id { 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 @@ VPX_CTRL_USE_TYPE(VP9_INVERT_TILE_DECODE_ORDER, int) /*! @} - end defgroup vp8_decoder */ +#ifdef __cplusplus +} // extern "C" +#endif -#include "vpx_codec_impl_bottom.h" #endif |