From bd9e047e6506c96f76365f8e486bd1096e58d84f Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 18 Feb 2009 17:12:34 -0300 Subject: [PATCH] --- yaml --- r: 137969 b: refs/heads/master c: 5ca75b00ffd0df5bae16e84830f2710537efed11 h: refs/heads/master i: 137967: a0c5c916bd5cb94a77187cf36897fb49399055d9 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/zoran/zoran_driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ae54fa676bad..c04649c361d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ba514d5d39d017e320ffba6d2a98563b829d37c +refs/heads/master: 5ca75b00ffd0df5bae16e84830f2710537efed11 diff --git a/trunk/drivers/media/video/zoran/zoran_driver.c b/trunk/drivers/media/video/zoran/zoran_driver.c index cdfd3cc05151..7129f9254e70 100644 --- a/trunk/drivers/media/video/zoran/zoran_driver.c +++ b/trunk/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;