Browse Source

Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21'

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

Conflicts:
	libavutil/random_seed.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Michael Niedermayer 12 years ago
parent
commit
579a137897
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavutil/random_seed.c

+ 2
- 1
libavutil/random_seed.c View File

@@ -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)


Loading…
Cancel
Save