---

yaml --- r: 113935 b: refs/heads/master c: 8ca4dae h: refs/heads/master i: 113933: 511b36e 113931: 7fac9c8 113927: ab3435f 113919: 68c3264 v: v3
git-mirror · Oct 12, 2008 · bfcadd9 · bfcadd9
1 parent a074f3d
commit bfcadd9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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 =