Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:18:17 +0000 (11:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:18:17 +0000 (11:18 +0200)
* commit '880391ed2d2faf796ca3a16f63cec69767546a21':
  libavutil: use avpriv_open()

Conflicts:
libavutil/random_seed.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/random_seed.c

  #include <fcntl.h>
  #include <math.h>
  #include <time.h>
 +#include <string.h>
 +#include "avassert.h"
+ #include "internal.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)
  {