From bfcadd908e032cf17d7e273e1b3496db158512da Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 7 Sep 2008 05:58:54 -0300 Subject: [PATCH] --- yaml --- r: 113935 b: refs/heads/master c: 8ca4dae3e601b527cb099ef72d821d7af075f8ae h: refs/heads/master i: 113933: 511b36eee8e70c5720116bbf7d41c239bb8e18ff 113931: 7fac9c89cd0ce3ec0d25e285ac84fbbf36101b8b 113927: ab3435ffbf7809bf293832efd93c4a8f332d66c7 113919: 68c326429df02b54cf48f87a549218ac3ff94709 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/zoran_driver.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ed9e7f91a1e0..45d0a24d2e31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c522e74902a1fa15a7ec5e5a3325b250afa54ab +refs/heads/master: 8ca4dae3e601b527cb099ef72d821d7af075f8ae diff --git a/trunk/drivers/media/video/zoran_driver.c b/trunk/drivers/media/video/zoran_driver.c index f0af9b7f8ffc..25de7631443e 100644 --- a/trunk/drivers/media/video/zoran_driver.c +++ b/trunk/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 =