summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2008-09-07 12:58:54 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 15:37:02 +0400
commit8ca4dae3e601b527cb099ef72d821d7af075f8ae (patch)
tree0764b4773da0840a1025e5e136707dd1215fcd6d
parent4c522e74902a1fa15a7ec5e5a3325b250afa54ab (diff)
downloadlinux-8ca4dae3e601b527cb099ef72d821d7af075f8ae.tar.xz
V4L/DVB (8962): zr36067: VIDIOC_S_FMT returns the colorspace value
Ioctl VIDIOC_S_FMT is supposed to fill the colorspace value in the returned buffer. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/zoran_driver.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index f0af9b7f8ffc..25de7631443e 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -2917,6 +2917,8 @@ zoran_do_ioctl (struct inode *inode,
fmt->fmt.pix.bytesperline = 0;
fmt->fmt.pix.sizeimage =
fh->jpg_buffers.buffer_size;
+ fmt->fmt.pix.colorspace =
+ V4L2_COLORSPACE_SMPTE170M;
/* we hereby abuse this variable to show that
* we're gonna do mjpeg capture */
@@ -2976,6 +2978,8 @@ zoran_do_ioctl (struct inode *inode,
fmt->fmt.pix.sizeimage =
fh->v4l_settings.height *
fh->v4l_settings.bytesperline;
+ fmt->fmt.pix.colorspace =
+ fh->v4l_settings.format->colorspace;
if (BUZ_MAX_HEIGHT <
(fh->v4l_settings.height * 2))
fmt->fmt.pix.field =