summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-02-18 21:12:34 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2009-02-18 21:12:34 +0100
commit3c0d4e5fb734b1afe1cd961a4c61b90c8c6d5d9d (patch)
treeb1133cf371ef6e1f8c094c76417b85840029c388 /linux/drivers/media
parent796fbda0aa38a68a6ba7451fb0cb1974f36cf956 (diff)
downloadmediapointer-dvb-s2-3c0d4e5fb734b1afe1cd961a4c61b90c8c6d5d9d.tar.gz
mediapointer-dvb-s2-3c0d4e5fb734b1afe1cd961a4c61b90c8c6d5d9d.tar.bz2
zoran: fix G_FMT
From: Hans Verkuil <hverkuil@xs4all.nl> Returned height was really height / 2. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/zoran/zoran_driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/zoran/zoran_driver.c b/linux/drivers/media/video/zoran/zoran_driver.c
index 748df1fcf..98741c992 100644
--- a/linux/drivers/media/video/zoran/zoran_driver.c
+++ b/linux/drivers/media/video/zoran/zoran_driver.c
@@ -2084,7 +2084,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;