[FFmpeg-cvslog] Merge commit '588b6215b4c74945994eb9636b0699028c069ed2'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Nov 22 14:29:09 2015 +0000| [e12f4036786136734b917d5bad641f2f89c3f9d2] | committer: Derek Buitenhuis

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e12f4036786136734b917d5bad641f2f89c3f9d2
---