diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 15:56:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 15:57:33 +0100 |
| commit | e7e0186eeb0a0aa1e2ca805b97eb60cbd14e0567 (patch) | |
| tree | b19a7ab7351615a21aa0ac7d57c7a486f7318e5b /libavutil/version.h | |
| parent | e074fe2962df5a43ac41f26b2180094057600cc5 (diff) | |
| parent | ab2ad8bd56882c0ea160b154e8b836eb71abc49d (diff) | |
| download | ffmpeg-e7e0186eeb0a0aa1e2ca805b97eb60cbd14e0567.tar.gz | |
Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'
* commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d':
lavf: Add functions for SRTP decryption/encryption
lavu: Add an API for calculating HMAC (RFC 2104)
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index f59fd9baea..c0c8fcad2e 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 14 +#define LIBAVUTIL_VERSION_MINOR 15 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |