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 /libavformat/rtmpcrypt.c | |
| 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 'libavformat/rtmpcrypt.c')
| -rw-r--r-- | libavformat/rtmpcrypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmpcrypt.c b/libavformat/rtmpcrypt.c index 2065ec6602..184bcf63fa 100644 --- a/libavformat/rtmpcrypt.c +++ b/libavformat/rtmpcrypt.c @@ -186,7 +186,7 @@ static void rtmpe8_sig(const uint8_t *in, uint8_t *out, int key_id) struct AVXTEA ctx; av_xtea_init(&ctx, rtmpe8_keys[key_id]); - av_xtea_crypt(&ctx, out, in, 1, NULL, 0); + av_xtea_le_crypt(&ctx, out, in, 1, NULL, 0); } static void rtmpe9_sig(const uint8_t *in, uint8_t *out, int key_id) |