Fix unintended renaming

pull/1/head
Darrell Anderson 10 years ago
parent 2f4437e4f1
commit 201d8ca425

@ -414,7 +414,7 @@ int V4L2_Base::init_mmap(char *errmsg)
req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
req.memory = V4L2_MEMORY_MMAP; req.memory = V4L2_MEMORY_MMAP;
if (-1 == xioctl (fd, VIDIOC_RETQBUFS, &req)) { if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) {
if (EINVAL == errno) { if (EINVAL == errno) {
fprintf (stderr, "%s does not support " fprintf (stderr, "%s does not support "
"memory mapping\n", dev_name); "memory mapping\n", dev_name);
@ -422,7 +422,7 @@ int V4L2_Base::init_mmap(char *errmsg)
"memory mapping\n", dev_name); "memory mapping\n", dev_name);
return -1; return -1;
} else { } else {
return errno_exit ("VIDIOC_RETQBUFS", errmsg); return errno_exit ("VIDIOC_REQBUFS", errmsg);
} }
} }
@ -482,13 +482,13 @@ void V4L2_Base::init_userp(unsigned int buffer_size)
req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
req.memory = V4L2_MEMORY_USERPTR; req.memory = V4L2_MEMORY_USERPTR;
if (-1 == xioctl (fd, VIDIOC_RETQBUFS, &req)) { if (-1 == xioctl (fd, VIDIOC_REQBUFS, &req)) {
if (EINVAL == errno) { if (EINVAL == errno) {
fprintf (stderr, "%s does not support " fprintf (stderr, "%s does not support "
"user pointer i/o\n", dev_name); "user pointer i/o\n", dev_name);
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} else { } else {
errno_exit ("VIDIOC_RETQBUFS", errmsg); errno_exit ("VIDIOC_REQBUFS", errmsg);
} }
} }

@ -838,7 +838,7 @@ struct v4l2_streamparm
#define VIDIOC_G_COMP _IOR ('V', 6, struct v4l2_compression) #define VIDIOC_G_COMP _IOR ('V', 6, struct v4l2_compression)
#define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression) #define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression)
#endif #endif
#define VIDIOC_RETQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) #define VIDIOC_REQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers)
#define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer) #define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer)
#define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer) #define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer)
#define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer) #define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer)

Loading…
Cancel
Save