diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-05 18:52:23 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-05 18:52:23 -0300 |
commit | 21ffe960decd954bf2e0959e5d85ec5484477bbd (patch) | |
tree | b3e1150fe0889249c114c682582dee30b6c2e250 /linux/drivers/media/video/cx231xx | |
parent | e1afff6e5f2d6b35928ab6651ac5705659713ca0 (diff) | |
parent | 3304a5198cc1315ca633f1d17bcbdb36a07e9bfb (diff) | |
download | mediapointer-dvb-s2-21ffe960decd954bf2e0959e5d85ec5484477bbd.tar.gz mediapointer-dvb-s2-21ffe960decd954bf2e0959e5d85ec5484477bbd.tar.bz2 |
merge: http://www.linuxtv.org/hg/~dougsland/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx231xx')
-rw-r--r-- | linux/drivers/media/video/cx231xx/cx231xx-video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx231xx/cx231xx-video.c b/linux/drivers/media/video/cx231xx/cx231xx-video.c index e00edd0aa..7e5bfcc94 100644 --- a/linux/drivers/media/video/cx231xx/cx231xx-video.c +++ b/linux/drivers/media/video/cx231xx/cx231xx-video.c @@ -923,8 +923,8 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, f->fmt.pix.width = dev->width; f->fmt.pix.height = dev->height; - f->fmt.pix.pixelformat = dev->format->fourcc;; - f->fmt.pix.bytesperline = (dev->width * dev->format->depth + 7) >> 3;; + f->fmt.pix.pixelformat = dev->format->fourcc; + f->fmt.pix.bytesperline = (dev->width * dev->format->depth + 7) >> 3; f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * dev->height; f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; |