diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 11:36:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 11:36:21 +0200 |
| commit | 95fa1fe437c7dfe7b9a01685d3e9e9f3525f0bdc (patch) | |
| tree | 6269787c5022ccabc0f0ccab1289040c51d9bfde /libavdevice/oss_audio.c | |
| parent | eec9c7af3370ee1a114597686382a4ca029392ca (diff) | |
| parent | 71bf6b41d974229a06921806c333ce98566a5d8a (diff) | |
| download | ffmpeg-95fa1fe437c7dfe7b9a01685d3e9e9f3525f0bdc.tar.gz | |
Merge commit '71bf6b41d974229a06921806c333ce98566a5d8a'
* commit '71bf6b41d974229a06921806c333ce98566a5d8a':
libavdevice: use avpriv_open()
Conflicts:
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/oss_audio.c')
| -rw-r--r-- | libavdevice/oss_audio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c index aa40034ea9..916908c425 100644 --- a/libavdevice/oss_audio.c +++ b/libavdevice/oss_audio.c @@ -34,6 +34,7 @@ #include <fcntl.h> #include <sys/ioctl.h> +#include "libavutil/internal.h" #include "libavutil/log.h" #include "libavutil/opt.h" #include "libavutil/time.h" @@ -63,9 +64,9 @@ static int audio_open(AVFormatContext *s1, int is_output, const char *audio_devi char *flip = getenv("AUDIO_FLIP_LEFT"); if (is_output) - audio_fd = open(audio_device, O_WRONLY); + audio_fd = avpriv_open(audio_device, O_WRONLY); else - audio_fd = open(audio_device, O_RDONLY); + audio_fd = avpriv_open(audio_device, O_RDONLY); if (audio_fd < 0) { av_log(s1, AV_LOG_ERROR, "%s: %s\n", audio_device, strerror(errno)); return AVERROR(EIO); |