Commit 579a1378 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '880391ed'

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

Conflicts:
	libavutil/random_seed.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 87e8cbf7 880391ed
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment