diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 14:29:09 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 14:29:09 +0000 |
| commit | e12f4036786136734b917d5bad641f2f89c3f9d2 (patch) | |
| tree | f7d69dea07ae423d3c4b01bfbb6400cb7ce7bdbb /libavutil/version.h | |
| parent | ced39dc5ed3ad40e7f970c95019721d58742088a (diff) | |
| parent | 588b6215b4c74945994eb9636b0699028c069ed2 (diff) | |
Merge commit '588b6215b4c74945994eb9636b0699028c069ed2'
* commit '588b6215b4c74945994eb9636b0699028c069ed2':
rtmpcrypt: Do the xtea decryption in little endian mode
xtea: Add functions for little endian mode
Conflicts:
libavutil/xtea.c
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
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 8198e6ded8..4520c52909 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 7 +#define LIBAVUTIL_VERSION_MINOR 8 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |