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 /doc | |
parent | ced39dc5ed3ad40e7f970c95019721d58742088a (diff) | |
parent | 588b6215b4c74945994eb9636b0699028c069ed2 (diff) | |
download | ffmpeg-e12f4036786136734b917d5bad641f2f89c3f9d2.tar.gz |
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 'doc')
-rw-r--r-- | doc/APIchanges | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index edeba02bff..c454cd2bb4 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,8 @@ libavutil: 2015-08-28 API changes, most recent first: +2015-11-xx - xxxxxxx - lavu 55.8.100 - xtea.h + Add av_xtea_le_init and av_xtea_le_crypt 2015-11-18 - lavu 55.7.100 - mem.h Add av_fast_mallocz() |