virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21'

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

Conflicts:
	libavutil/random_seed.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-08 11:18:17 +02:00
commit 579a137897
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/random_seed.c
View File

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