summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zoran
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-02-18 17:12:34 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:42:56 -0300
commit5ca75b00ffd0df5bae16e84830f2710537efed11 (patch)
treea2cac4f817ea75550aa150600b2033b6dce0d9fe /drivers/media/video/zoran
parent0ba514d5d39d017e320ffba6d2a98563b829d37c (diff)
downloadop-kernel-dev-5ca75b00ffd0df5bae16e84830f2710537efed11.zip
op-kernel-dev-5ca75b00ffd0df5bae16e84830f2710537efed11.tar.gz
V4L/DVB (10712): zoran: fix G_FMT
Returned height was really height / 2. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/zoran')
-rw-r--r--drivers/media/video/zoran/zoran_driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index cdfd3cc..7129f92 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -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;
OpenPOWER on IntegriCloud