diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-25 14:19:18 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 21:07:04 -0400 |
commit | 3eaeef57423b5f9571e7524373ec079f583b2113 (patch) | |
tree | f643cb9e1e4154ea9265a3c90949955df4bfa186 /drivers/media | |
parent | 5d05704cbe7f9c4708e0f35be13839f593441215 (diff) |
V4L/DVB (6109): ivtv: use new videodev2.h pixel formats
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-ioctl.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index 6d24c6b9a45b..206eee7542db 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/drivers/media/video/ivtv/ivtv-ioctl.c | |||
@@ -1186,7 +1186,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void | |||
1186 | struct v4l2_framebuffer *fb = arg; | 1186 | struct v4l2_framebuffer *fb = arg; |
1187 | int pixfmt; | 1187 | int pixfmt; |
1188 | static u32 pixel_format[16] = { | 1188 | static u32 pixel_format[16] = { |
1189 | V4L2_PIX_FMT_RGB332, /* Really RGB Indexed */ | 1189 | V4L2_PIX_FMT_PAL8, /* Uses a 256-entry RGB colormap */ |
1190 | V4L2_PIX_FMT_RGB565, | 1190 | V4L2_PIX_FMT_RGB565, |
1191 | V4L2_PIX_FMT_RGB555, | 1191 | V4L2_PIX_FMT_RGB555, |
1192 | V4L2_PIX_FMT_RGB444, | 1192 | V4L2_PIX_FMT_RGB444, |
@@ -1194,12 +1194,11 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void | |||
1194 | 0, | 1194 | 0, |
1195 | 0, | 1195 | 0, |
1196 | 0, | 1196 | 0, |
1197 | /* Really YUV variants */ | 1197 | V4L2_PIX_FMT_PAL8, /* Uses a 256-entry YUV colormap */ |
1198 | V4L2_PIX_FMT_RGB332, /* Really YUV Indexed */ | 1198 | V4L2_PIX_FMT_YUV565, |
1199 | V4L2_PIX_FMT_RGB565, | 1199 | V4L2_PIX_FMT_YUV555, |
1200 | V4L2_PIX_FMT_RGB555, | 1200 | V4L2_PIX_FMT_YUV444, |
1201 | V4L2_PIX_FMT_RGB444, | 1201 | V4L2_PIX_FMT_YUV32, |
1202 | V4L2_PIX_FMT_RGB32, | ||
1203 | 0, | 1202 | 0, |
1204 | 0, | 1203 | 0, |
1205 | 0, | 1204 | 0, |