summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-09-07 10:58:54 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-07 10:58:54 +0200
commit487f2205ca8566f1e9a231c0323deaabebf2830a (patch)
tree917a819fedd6d58637ec911ea923cb0a07b6dd63
parent1dbcc03c16aadfb1651d83ad1e1e1a2462bfa2de (diff)
downloadmediapointer-dvb-s2-487f2205ca8566f1e9a231c0323deaabebf2830a.tar.gz
mediapointer-dvb-s2-487f2205ca8566f1e9a231c0323deaabebf2830a.tar.bz2
zr36067: VIDIOC_S_FMT returns the colorspace value
From: Jean Delvare <khali@linux-fr.org> 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--linux/drivers/media/video/zoran_driver.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/zoran_driver.c b/linux/drivers/media/video/zoran_driver.c
index 3e9e7a718..9d57a630c 100644
--- a/linux/drivers/media/video/zoran_driver.c
+++ b/linux/drivers/media/video/zoran_driver.c
@@ -2982,6 +2982,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 */
@@ -3041,6 +3043,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 =