Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21'

* commit '880391ed2d2faf796ca3a16f63cec69767546a21':
  libavutil: use avpriv_open()

Conflicts:
	libavutil/random_seed.c

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

diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c
index c67470461559e30d0175fdcb12d3e770b460844e..aa8902472eaffd521868ef606c32eb7da0183db5 100644 (file)
--- a/libavutil/random_seed.c
+++ b/libavutil/random_seed.c
@@ -32,6 +32,7 @@
 #include <time.h>
 #include <string.h>
 #include "avassert.h"
+#include "internal.h"
 #include "timer.h"
 #include "random_seed.h"
 #include "sha.h"
@@ -44,7 +45,7 @@
 static int read_random(uint32_t *dst, const char *file)
 {
 #if HAVE_UNISTD_H
-    int fd = open(file, O_RDONLY);
+    int fd = avpriv_open(file, O_RDONLY);
     int err = -1;
 
     if (fd == -1)