diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 11:18:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 11:18:17 +0200 |
| commit | 579a137897993e474af08499bd4c2ae62f4e9880 (patch) | |
| tree | 7ff32820367148a5b85af24f119608753233f80d | |
| parent | 87e8cbf70931b789efc04c978082fc5181a51a26 (diff) | |
| parent | 880391ed2d2faf796ca3a16f63cec69767546a21 (diff) | |
| download | ffmpeg-579a137897993e474af08499bd4c2ae62f4e9880.tar.gz | |
Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21'
* commit '880391ed2d2faf796ca3a16f63cec69767546a21':
libavutil: use avpriv_open()
Conflicts:
libavutil/random_seed.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/random_seed.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c index c674704615..aa8902472e 100644 --- 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) |