diff options
| author | hans@rhel5-devel.localdomain <hans@rhel5-devel.localdomain> | 2009-05-25 15:35:21 +0200 |
|---|---|---|
| committer | hans@rhel5-devel.localdomain <hans@rhel5-devel.localdomain> | 2009-05-25 15:35:21 +0200 |
| commit | 2ffc360be1c38ab86399d6d574ee7cc0671c03d6 (patch) | |
| tree | 98c7f73c6d0c2b0daa07da8b793e9bd306eca9be /v4l2-apps/libv4l/libv4l2 | |
| parent | 51949cfaadebd8e341fed1e85eca683dd40195d2 (diff) | |
| download | mediapointer-dvb-s2-2ffc360be1c38ab86399d6d574ee7cc0671c03d6.tar.gz mediapointer-dvb-s2-2ffc360be1c38ab86399d6d574ee7cc0671c03d6.tar.bz2 | |
libv4l: Obsolete the V4L2_ENABLE_ENUM_FMT_EMULATION v4l2_fd_open flag
From: Hans de Goede <hdegoede@redhat.com>
The V4L2_ENABLE_ENUM_FMT_EMULATION v4l2_fd_open flag is obsolete, libv4l2
now *always* reports emulated formats through the ENUM_FMT ioctl
Priority: normal
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'v4l2-apps/libv4l/libv4l2')
| -rw-r--r-- | v4l2-apps/libv4l/libv4l2/libv4l2.c | 4 | ||||
| -rw-r--r-- | v4l2-apps/libv4l/libv4l2/v4l2convert.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/v4l2-apps/libv4l/libv4l2/libv4l2.c b/v4l2-apps/libv4l/libv4l2/libv4l2.c index 053e6e28b..382dc405b 100644 --- a/v4l2-apps/libv4l/libv4l2/libv4l2.c +++ b/v4l2-apps/libv4l/libv4l2/libv4l2.c @@ -696,12 +696,12 @@ int v4l2_ioctl (int fd, unsigned long int request, ...) break; case VIDIOC_ENUM_FMT: if (((struct v4l2_fmtdesc *)arg)->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && - (devices[index].flags & V4L2_ENABLE_ENUM_FMT_EMULATION)) + !(devices[index].flags & V4L2_DISABLE_CONVERSION)) is_capture_request = 1; break; case VIDIOC_ENUM_FRAMESIZES: case VIDIOC_ENUM_FRAMEINTERVALS: - if (devices[index].flags & V4L2_ENABLE_ENUM_FMT_EMULATION) + if (!(devices[index].flags & V4L2_DISABLE_CONVERSION)) is_capture_request = 1; break; case VIDIOC_TRY_FMT: diff --git a/v4l2-apps/libv4l/libv4l2/v4l2convert.c b/v4l2-apps/libv4l/libv4l2/v4l2convert.c index 307a03ce5..b1354772d 100644 --- a/v4l2-apps/libv4l/libv4l2/v4l2convert.c +++ b/v4l2-apps/libv4l/libv4l2/v4l2convert.c @@ -92,7 +92,7 @@ LIBV4L_PUBLIC int open (const char *file, int oflag, ...) /* Try to Register with libv4l2 (in case of failure pass the fd to the application as is) */ - v4l2_fd_open(fd, V4L2_ENABLE_ENUM_FMT_EMULATION); + v4l2_fd_open(fd, 0); return fd; } |