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/fbdev.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/fbdev.c')
| -rw-r--r-- | libavdevice/fbdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c index 74f36d0d63..1156fb50a6 100644 --- a/libavdevice/fbdev.c +++ b/libavdevice/fbdev.c @@ -34,6 +34,7 @@ #include <time.h> #include <linux/fb.h> +#include "libavutil/internal.h" #include "libavutil/log.h" #include "libavutil/mem.h" #include "libavutil/opt.h" @@ -108,7 +109,7 @@ static av_cold int fbdev_read_header(AVFormatContext *avctx) if (avctx->flags & AVFMT_FLAG_NONBLOCK) flags |= O_NONBLOCK; - if ((fbdev->fd = open(avctx->filename, flags)) == -1) { + if ((fbdev->fd = avpriv_open(avctx->filename, flags)) == -1) { ret = AVERROR(errno); av_log(avctx, AV_LOG_ERROR, "Could not open framebuffer device '%s': %s\n", |