diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-27 11:55:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-27 11:55:53 -0300 |
| commit | ab110023a3a6411bbbfcd1a1946dfab1017813f7 (patch) | |
| tree | d25264ac8df90164a7d5071e58db40fb44b8d249 /linux/drivers/media/video/ivtv/ivtv-ioctl.c | |
| parent | e51e7bec003d4711379f452a1a95403b7da608a7 (diff) | |
| parent | 37b4c8e742d9c1c0e331435c16577693ec0877c3 (diff) | |
| download | mediapointer-dvb-s2-ab110023a3a6411bbbfcd1a1946dfab1017813f7.tar.gz mediapointer-dvb-s2-ab110023a3a6411bbbfcd1a1946dfab1017813f7.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb-pixfmt
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-ioctl.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-ioctl.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-ioctl.c b/linux/drivers/media/video/ivtv/ivtv-ioctl.c index 62d1bb3bd..10862dbb2 100644 --- a/linux/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/linux/drivers/media/video/ivtv/ivtv-ioctl.c @@ -1198,7 +1198,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void struct v4l2_framebuffer *fb = arg; int pixfmt; static u32 pixel_format[16] = { - V4L2_PIX_FMT_RGB332, /* Really RGB Indexed */ + V4L2_PIX_FMT_PAL8, /* Uses a 256-entry RGB colormap */ V4L2_PIX_FMT_RGB565, V4L2_PIX_FMT_RGB555, V4L2_PIX_FMT_RGB444, @@ -1206,12 +1206,11 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void 0, 0, 0, - /* Really YUV variants */ - V4L2_PIX_FMT_RGB332, /* Really YUV Indexed */ - V4L2_PIX_FMT_RGB565, - V4L2_PIX_FMT_RGB555, - V4L2_PIX_FMT_RGB444, - V4L2_PIX_FMT_RGB32, + V4L2_PIX_FMT_PAL8, /* Uses a 256-entry YUV colormap */ + V4L2_PIX_FMT_YUV565, + V4L2_PIX_FMT_YUV555, + V4L2_PIX_FMT_YUV444, + V4L2_PIX_FMT_YUV32, 0, 0, 0, |