From b97f7d9d24324a5fdf3516ca1e45e142e05ba336 Mon Sep 17 00:00:00 2001 From: Giorgio Vazzana Date: Thu, 28 Mar 2013 13:03:02 +0100 Subject: lavd/v4l2: replace ioctl() with v4l2_ioctl() This is consistent with the rest of the file and makes listing of emulated formats possible when ffmpeg is compiled with libv4l2. Signed-off-by: Michael Niedermayer --- libavdevice/v4l2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavdevice/v4l2.c') diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index c041424952..539eae6a3f 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -323,7 +323,7 @@ static void list_framesizes(AVFormatContext *ctx, int fd, uint32_t pixelformat) { struct v4l2_frmsizeenum vfse = { .pixel_format = pixelformat }; - while(!ioctl(fd, VIDIOC_ENUM_FRAMESIZES, &vfse)) { + while(!v4l2_ioctl(fd, VIDIOC_ENUM_FRAMESIZES, &vfse)) { switch (vfse.type) { case V4L2_FRMSIZE_TYPE_DISCRETE: av_log(ctx, AV_LOG_INFO, " %ux%u", @@ -348,7 +348,7 @@ static void list_formats(AVFormatContext *ctx, int fd, int type) { struct v4l2_fmtdesc vfd = { .type = V4L2_BUF_TYPE_VIDEO_CAPTURE }; - while(!ioctl(fd, VIDIOC_ENUM_FMT, &vfd)) { + while(!v4l2_ioctl(fd, VIDIOC_ENUM_FMT, &vfd)) { enum AVCodecID codec_id = fmt_v4l2codec(vfd.pixelformat); enum AVPixelFormat pix_fmt = fmt_v4l2ff(vfd.pixelformat, codec_id); -- cgit v1.2.3