diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 10:41:16 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 10:41:16 +0200 |
| commit | 3cf08e96fc85ec59b9da2dc79dc1eefc67f5c72d (patch) | |
| tree | 24a53de6e365472dd8758444d8139b68070b0677 /libavutil/des.h | |
| parent | 9ca19971bcdd1af39680c15a0319d57505b9542b (diff) | |
| parent | d9e8b47e3144262d6bc4681740411d4bdafad6ac (diff) | |
| download | ffmpeg-3cf08e96fc85ec59b9da2dc79dc1eefc67f5c72d.tar.gz | |
Merge commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac'
* commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac':
des: add av_des_alloc()
Conflicts:
libavutil/des.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil/des.h')
| -rw-r--r-- | libavutil/des.h | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/libavutil/des.h b/libavutil/des.h index 2feb0468db..7c96dd84e1 100644 --- a/libavutil/des.h +++ b/libavutil/des.h @@ -24,10 +24,25 @@ #include <stdint.h> -struct AVDES { +/** + * @defgroup lavu_des DES + * @ingroup lavu_crypto + * @{ + */ + +#if FF_API_CRYPTO_CONTEXT +typedef struct AVDES { uint64_t round_keys[3][16]; int triple_des; -}; +} AVDES; +#else +typedef struct AVDES AVDES; +#endif + +/** + * Allocate an AVDES context. + */ +AVDES *av_des_alloc(void); /** * @brief Initializes an AVDES context. @@ -58,4 +73,8 @@ void av_des_crypt(struct AVDES *d, uint8_t *dst, const uint8_t *src, int count, */ void av_des_mac(struct AVDES *d, uint8_t *dst, const uint8_t *src, int count); +/** + * @} + */ + #endif /* AVUTIL_DES_H */ |