diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 16:05:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 16:05:34 +0100 |
| commit | b52925d2cde98b2a3ffaf451248191c8627d356a (patch) | |
| tree | b5bc13efa1c4f0151fb47fecf295935000c71dc7 /libavformat/version.h | |
| parent | e7e0186eeb0a0aa1e2ca805b97eb60cbd14e0567 (diff) | |
| parent | 2f3bada63e57345329c4f9b48e9b81b5cfc03d05 (diff) | |
Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05'
* commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05':
lavf: Add a protocol for SRTP encryption/decryption
rtsp: Support decryption of SRTP signalled via RFC 4568 (SDES)
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index e50e501462..e1fe74e034 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,8 +30,8 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 54 -#define LIBAVFORMAT_VERSION_MINOR 59 -#define LIBAVFORMAT_VERSION_MICRO 107 +#define LIBAVFORMAT_VERSION_MINOR 60 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |