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/dv1394.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/dv1394.c')
| -rw-r--r-- | libavdevice/dv1394.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c index 5d94f5c894..0af5ea53c7 100644 --- a/libavdevice/dv1394.c +++ b/libavdevice/dv1394.c @@ -27,6 +27,7 @@ #include <sys/ioctl.h> #include <sys/mman.h> +#include "libavutil/internal.h" #include "libavutil/log.h" #include "libavutil/opt.h" #include "avdevice.h" @@ -88,7 +89,7 @@ static int dv1394_read_header(AVFormatContext * context) goto failed; /* Open and initialize DV1394 device */ - dv->fd = open(context->filename, O_RDONLY); + dv->fd = avpriv_open(context->filename, O_RDONLY); if (dv->fd < 0) { av_log(context, AV_LOG_ERROR, "Failed to open DV interface: %s\n", strerror(errno)); goto failed; |