Merge commit '01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f'

* commit '01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f':
  random_seed: Rewrite the generic clock() based seed code

Conflicts:
	libavutil/random_seed.c

See: 66531c75d3bfd8a013acd8bd3c04a131dae2a1a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavutil/random_seed.c
index aa89024,26884cb..e3ffaff
--- 1/libavutil/random_seed.c
--- 2/libavutil/random_seed.c
+++ b/libavutil/random_seed.c
@@@ -30,18 -30,13 +30,18 @@@
  #include <fcntl.h>
  #include <math.h>
  #include <time.h>
 +#include <string.h>
 +#include "avassert.h"
  #include "internal.h"
 -#include "mem.h"
+ #include "intreadwrite.h"
  #include "timer.h"
  #include "random_seed.h"
  #include "sha.h"
- #include "intreadwrite.h"
  
 +#ifndef TEST
 +#define TEST 0
 +#endif
 +
  static int read_random(uint32_t *dst, const char *file)
  {
  #if HAVE_UNISTD_H
@@@ -61,11 -56,10 +61,11 @@@
  
  static uint32_t get_generic_seed(void)
  {
 -    struct AVSHA *sha = av_sha_alloc();
 +    uint8_t tmp[120];
 +    struct AVSHA *sha = (void*)tmp;
      clock_t last_t  = 0;
      static uint64_t i = 0;
-     static uint32_t buffer[512] = {0};
+     static uint32_t buffer[512] = { 0 };
      unsigned char digest[20];
      uint64_t last_i = i;
  
@@@ -84,23 -66,30 +84,23 @@@
      for (;;) {
          clock_t t = clock();
  
-         if(last_t == t){
-             buffer[i&511]++;
-         }else{
-             buffer[++i&511]+= (t-last_t) % 3294638521U;
-             if(last_i && i-last_i > 4 || i-last_i > 64 || TEST && i-last_i > 8)
+         if (last_t == t) {
+             buffer[i & 511]++;
+         } else {
+             buffer[++i & 511] += (t - last_t) % 3294638521U;
 -            if (last_i && i - last_i > 4 || i - last_i > 64)
++            if (last_i && i - last_i > 4 || i - last_i > 64 || TEST && i - last_i > 8)
                  break;
          }
          last_t = t;
      }
  
 -    if (!sha) {
 -        uint32_t seed = 0;
 -        int j;
 -        // Unable to allocate an sha context, just xor the buffer together
 -        // to create something hopefully unique.
 -        for (j = 0; j < 512; j++)
 -            seed ^= buffer[j];
 -        return seed;
 -    }
 +    if(TEST)
 +        buffer[0] = buffer[1] = 0;
 +
      av_sha_init(sha, 160);
-     av_sha_update(sha, (uint8_t*)buffer, sizeof(buffer));
 -    av_sha_update(sha, (const uint8_t *) buffer, sizeof(buffer));
++    av_sha_update(sha, (const uint8_t *)buffer, sizeof(buffer));
      av_sha_final(sha, digest);
-     return AV_RB32(digest) + AV_RB32(digest+16);
 -    av_free(sha);
+     return AV_RB32(digest) + AV_RB32(digest + 16);
  }
  
  uint32_t av_get_random_seed(void)