V4L/DVB (10712): zoran: fix G_FMT
authorHans Verkuil <hverkuil@xs4all.nl>
Wed, 18 Feb 2009 20:12:34 +0000 (17:12 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 30 Mar 2009 15:42:56 +0000 (12:42 -0300)
Returned height was really height / 2.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/zoran/zoran_driver.c

index cdfd3cc05151e7a2b786c4ed3cbe23018ebecb4f..7129f9254e70b20ce9df73aadf4866e9b3434400 100644 (file)
@@ -2083,7 +2083,7 @@ static int zoran_g_fmt_vid_out(struct file *file, void *__fh,
        mutex_lock(&zr->resource_lock);
 
        fmt->fmt.pix.width = fh->jpg_settings.img_width / fh->jpg_settings.HorDcm;
-       fmt->fmt.pix.height = fh->jpg_settings.img_height /
+       fmt->fmt.pix.height = fh->jpg_settings.img_height * 2 /
                (fh->jpg_settings.VerDcm * fh->jpg_settings.TmpDcm);
        fmt->fmt.pix.sizeimage = zoran_v4l2_calc_bufsize(&fh->jpg_settings);
        fmt->fmt.pix.pixelformat = V4L2_PIX_FMT_MJPEG;