diff --git a/[refs] b/[refs] index c4db5932cfd0..62e53da5b408 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 770056c47fbb5c4d892d1cd55ae5ec68cf44c2b4 +refs/heads/master: e618578dd828458f35c2cd16edfa7a1dba07ce43 diff --git a/trunk/drivers/media/usb/tm6000/tm6000-video.c b/trunk/drivers/media/usb/tm6000/tm6000-video.c index 25202a71d65e..ac2588535f48 100644 --- a/trunk/drivers/media/usb/tm6000/tm6000-video.c +++ b/trunk/drivers/media/usb/tm6000/tm6000-video.c @@ -913,6 +913,7 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, f->fmt.pix.height = fh->height; f->fmt.pix.field = fh->vb_vidq.field; f->fmt.pix.pixelformat = fh->fmt->fourcc; + f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; f->fmt.pix.bytesperline = (f->fmt.pix.width * fh->fmt->depth) >> 3; f->fmt.pix.sizeimage = @@ -967,6 +968,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, (f->fmt.pix.width * fmt->depth) >> 3; f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline; + f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; return 0; }