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>

diff --cc doc/APIchanges
index edeba02,206796e..c454cd2
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -14,11 -12,15 +14,13 @@@ libavutil:     2015-08-2
  
  
  API changes, most recent first:
 -2015-11-xx - xxxxxxx - lavu 55.3.0 - xtea.h
++2015-11-xx - xxxxxxx - lavu 55.8.100 - xtea.h
+     Add av_xtea_le_init and av_xtea_le_crypt
  
 -2015-11-xx - xxxxxxx - lavfi 6.1.0 - avfilter.h
 -    Add a frame_rate field to AVFilterLink
 +2015-11-18 - lavu 55.7.100 - mem.h
 +  Add av_fast_mallocz()
  
 -2015-xx-xx - xxxxxxx - lavc 57.6.0 - avcodec.h
 -
 -2015-xx-xx - lavc 57.7.0 - avcodec.h
 +2015-10-29 - lavc 57.12.100 / 57.8.0 - avcodec.h
    xxxxxx - Deprecate av_free_packet(). Use av_packet_unref() as replacement,
             it resets the packet in a more consistent way.
    xxxxxx - Deprecate av_dup_packet(), it is a no-op for most cases.

diff --cc libavformat/rtmpcrypt.c
Simple merge

diff --cc libavutil/version.h
index 8198e6d,7131122..4520c52
--- 1/libavutil/version.h
--- 2/libavutil/version.h
+++ b/libavutil/version.h
@@@ -55,9 -53,9 +55,9 @@@
   * @{
   */
  
 -#define LIBAVUTIL_VERSION_MAJOR 55
 -#define LIBAVUTIL_VERSION_MINOR  3
 -#define LIBAVUTIL_VERSION_MICRO  0
 +#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, \
                                                 LIBAVUTIL_VERSION_MINOR, \

diff --cc libavutil/xtea.c
index 0d58cba,25fd2f0..2139aa5
--- 1/libavutil/xtea.c
--- 2/libavutil/xtea.c
+++ b/libavutil/xtea.c
@@@ -254,9 -234,9 +312,9 @@@ static void test_xtea(AVXTEA *ctx, uint
  int main(void)
  {
      AVXTEA ctx;
-     uint8_t buf[8], iv[8];
-     int i;
+     uint8_t buf[16], iv[8];
+     int i, j;
 -    const uint8_t src[32] = "HelloWorldHelloWorldHelloWorld";
 +    static const uint8_t src[32] = "HelloWorldHelloWorldHelloWorld";
      uint8_t ct[32];
      uint8_t pl[32];
  
@@@ -272,12 -262,11 +340,12 @@@
  
          /* decrypt into pl */
          memcpy(iv, "HALLO123", 8);
-         test_xtea(&ctx, pl, ct, src, 4, iv, 1, "CBC decryption");
+         test_xtea(&ctx, pl, ct, src, 4, iv, 1, "CBC decryption", av_xtea_crypt);
  
          memcpy(iv, "HALLO123", 8);
-         test_xtea(&ctx, ct, ct, src, 4, iv, 1, "CBC inplace decryption");
+         test_xtea(&ctx, ct, ct, src, 4, iv, 1, "CBC inplace decryption", av_xtea_crypt);
      }
 +
      printf("Test encryption/decryption success.\n");
  
      return 0;

diff --cc libavutil/xtea.h
Simple merge