diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 10:38:12 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 10:38:12 +0200 |
commit | 9ed59f16e005554fe412bcc05b2ed40688f4fd16 (patch) | |
tree | 2827c201867aaa7610ec8042a122295cf53b44f8 /libavutil/blowfish.h | |
parent | 988ddfea5e32226448e353766c8d9b610914e087 (diff) | |
parent | 7a7df34c91e16ea8936f59524145a2cdd6b790f9 (diff) |
Merge commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9'
* commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9':
blowfish: add av_blowfish_alloc()
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil/blowfish.h')
-rw-r--r-- | libavutil/blowfish.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavutil/blowfish.h b/libavutil/blowfish.h index 0b004532de..d163fd3578 100644 --- a/libavutil/blowfish.h +++ b/libavutil/blowfish.h @@ -23,6 +23,7 @@ #define AVUTIL_BLOWFISH_H #include <stdint.h> +#include "version.h" /** * @defgroup lavu_blowfish Blowfish @@ -30,12 +31,21 @@ * @{ */ +#if FF_API_CRYPTO_CONTEXT #define AV_BF_ROUNDS 16 typedef struct AVBlowfish { uint32_t p[AV_BF_ROUNDS + 2]; uint32_t s[4][256]; } AVBlowfish; +#else +typedef struct AVBlowfish AVBlowfish; +#endif + +/** + * Allocate an AVBlowfish context. + */ +AVBlowfish *av_blowfish_alloc(void); /** * Initialize an AVBlowfish context. |