Commit 71bf6b41 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by Anton Khirnov
Browse files

libavdevice: use avpriv_open()


Signed-off-by: default avatarAnton Khirnov <anton@khirnov.net>
parent fee9db1f
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#include "libavformat/internal.h" #include "libavformat/internal.h"
#include "libavutil/internal.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/parseutils.h" #include "libavutil/parseutils.h"
...@@ -136,7 +137,7 @@ static av_cold int bktr_init(const char *video_device, int width, int height, ...@@ -136,7 +137,7 @@ static av_cold int bktr_init(const char *video_device, int width, int height,
act.sa_handler = catchsignal; act.sa_handler = catchsignal;
sigaction(SIGUSR1, &act, &old); sigaction(SIGUSR1, &act, &old);
*tuner_fd = open("/dev/tuner0", O_RDONLY); *tuner_fd = avpriv_open("/dev/tuner0", O_RDONLY);
if (*tuner_fd < 0) if (*tuner_fd < 0)
av_log(NULL, AV_LOG_ERROR, "Warning. Tuner not opened, continuing: %s\n", strerror(errno)); av_log(NULL, AV_LOG_ERROR, "Warning. Tuner not opened, continuing: %s\n", strerror(errno));
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include "libavutil/internal.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
...@@ -88,7 +89,7 @@ static int dv1394_read_header(AVFormatContext * context) ...@@ -88,7 +89,7 @@ static int dv1394_read_header(AVFormatContext * context)
goto failed; goto failed;
/* Open and initialize DV1394 device */ /* Open and initialize DV1394 device */
dv->fd = open(context->filename, O_RDONLY); dv->fd = avpriv_open(context->filename, O_RDONLY);
if (dv->fd < 0) { if (dv->fd < 0) {
av_log(context, AV_LOG_ERROR, "Failed to open DV interface: %s\n", strerror(errno)); av_log(context, AV_LOG_ERROR, "Failed to open DV interface: %s\n", strerror(errno));
goto failed; goto failed;
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <time.h> #include <time.h>
#include <linux/fb.h> #include <linux/fb.h>
#include "libavutil/internal.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
...@@ -114,7 +115,7 @@ static av_cold int fbdev_read_header(AVFormatContext *avctx) ...@@ -114,7 +115,7 @@ static av_cold int fbdev_read_header(AVFormatContext *avctx)
if (avctx->flags & AVFMT_FLAG_NONBLOCK) if (avctx->flags & AVFMT_FLAG_NONBLOCK)
flags |= O_NONBLOCK; flags |= O_NONBLOCK;
if ((fbdev->fd = open(avctx->filename, flags)) == -1) { if ((fbdev->fd = avpriv_open(avctx->filename, flags)) == -1) {
ret = AVERROR(errno); ret = AVERROR(errno);
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Could not open framebuffer device '%s': %s\n", "Could not open framebuffer device '%s': %s\n",
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "libavutil/internal.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/time.h" #include "libavutil/time.h"
...@@ -63,9 +64,9 @@ static int audio_open(AVFormatContext *s1, int is_output, const char *audio_devi ...@@ -63,9 +64,9 @@ static int audio_open(AVFormatContext *s1, int is_output, const char *audio_devi
char *flip = getenv("AUDIO_FLIP_LEFT"); char *flip = getenv("AUDIO_FLIP_LEFT");
if (is_output) if (is_output)
audio_fd = open(audio_device, O_WRONLY); audio_fd = avpriv_open(audio_device, O_WRONLY);
else else
audio_fd = open(audio_device, O_RDONLY); audio_fd = avpriv_open(audio_device, O_RDONLY);
if (audio_fd < 0) { if (audio_fd < 0) {
av_log(s1, AV_LOG_ERROR, "%s: %s\n", audio_device, strerror(errno)); av_log(s1, AV_LOG_ERROR, "%s: %s\n", audio_device, strerror(errno));
return AVERROR(EIO); return AVERROR(EIO);
......
...@@ -124,7 +124,7 @@ static int device_open(AVFormatContext *ctx) ...@@ -124,7 +124,7 @@ static int device_open(AVFormatContext *ctx)
flags |= O_NONBLOCK; flags |= O_NONBLOCK;
} }
fd = open(ctx->filename, flags, 0); fd = avpriv_open(ctx->filename, flags);
if (fd < 0) { if (fd < 0) {
err = errno; err = errno;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment