diff options
author | Jean Delvare <khali@linux-fr.org> | 2008-09-07 04:58:54 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:37:02 -0400 |
commit | 8ca4dae3e601b527cb099ef72d821d7af075f8ae (patch) | |
tree | 0764b4773da0840a1025e5e136707dd1215fcd6d /drivers/media | |
parent | 4c522e74902a1fa15a7ec5e5a3325b250afa54ab (diff) |
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>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/zoran_driver.c | 4 |
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, | |||
2917 | fmt->fmt.pix.bytesperline = 0; | 2917 | fmt->fmt.pix.bytesperline = 0; |
2918 | fmt->fmt.pix.sizeimage = | 2918 | fmt->fmt.pix.sizeimage = |
2919 | fh->jpg_buffers.buffer_size; | 2919 | fh->jpg_buffers.buffer_size; |
2920 | fmt->fmt.pix.colorspace = | ||
2921 | V4L2_COLORSPACE_SMPTE170M; | ||
2920 | 2922 | ||
2921 | /* we hereby abuse this variable to show that | 2923 | /* we hereby abuse this variable to show that |
2922 | * we're gonna do mjpeg capture */ | 2924 | * we're gonna do mjpeg capture */ |
@@ -2976,6 +2978,8 @@ zoran_do_ioctl (struct inode *inode, | |||
2976 | fmt->fmt.pix.sizeimage = | 2978 | fmt->fmt.pix.sizeimage = |
2977 | fh->v4l_settings.height * | 2979 | fh->v4l_settings.height * |
2978 | fh->v4l_settings.bytesperline; | 2980 | fh->v4l_settings.bytesperline; |
2981 | fmt->fmt.pix.colorspace = | ||
2982 | fh->v4l_settings.format->colorspace; | ||
2979 | if (BUZ_MAX_HEIGHT < | 2983 | if (BUZ_MAX_HEIGHT < |
2980 | (fh->v4l_settings.height * 2)) | 2984 | (fh->v4l_settings.height * 2)) |
2981 | fmt->fmt.pix.field = | 2985 | fmt->fmt.pix.field = |