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/version.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/version.h')
-rw-r--r-- | libavutil/version.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index b10f3e120f..653f530631 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 29 +#define LIBAVUTIL_VERSION_MINOR 30 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ @@ -125,6 +125,9 @@ #ifndef FF_API_HMAC #define FF_API_HMAC (LIBAVUTIL_VERSION_MAJOR < 55) #endif +#ifndef FF_API_CRYPTO_CONTEXT +#define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 56) +#endif #ifndef FF_CONST_AVUTIL55 #if LIBAVUTIL_VERSION_MAJOR >= 55 |