aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiorgio Vazzana <mywing81@gmail.com>2013-03-28 13:03:02 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-28 16:17:04 +0100
commitb97f7d9d24324a5fdf3516ca1e45e142e05ba336 (patch)
treeb4a848c59f1a30273b4d058ee76119df0b9888c9
parente14f8bd07ef7135690e21d2192026d307a926cad (diff)
downloadffmpeg-b97f7d9d24324a5fdf3516ca1e45e142e05ba336.tar.gz
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 <michaelni@gmx.at>
-rw-r--r--libavdevice/v4l2.c4
1 files changed, 2 insertions, 2 deletions
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);