Skip to content

Commit

Permalink
V4L/DVB (10707): zoran: set bytesperline to 0 when using MJPEG.
Browse files Browse the repository at this point in the history
Remove bogus check on bytesperline in the try_fmt_vid_out call.
Just set it to 0.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Mar 30, 2009
1 parent 3e66793 commit 9f1b9ef
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/media/video/zoran/zoran_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -2549,12 +2549,11 @@ static int zoran_try_fmt_vid_out(struct file *file, void *__fh,
struct zoran_jpg_settings settings;
int res = 0;

if (fmt->fmt.pix.bytesperline > 0)
return -EINVAL;

if (fmt->fmt.pix.pixelformat != V4L2_PIX_FMT_MJPEG)
return -EINVAL;

fmt->fmt.pix.bytesperline = 0;

mutex_lock(&zr->resource_lock);
settings = fh->jpg_settings;

Expand Down Expand Up @@ -2608,9 +2607,6 @@ static int zoran_try_fmt_vid_cap(struct file *file, void *__fh,
struct zoran *zr = fh->zr;
int i;

if (fmt->fmt.pix.bytesperline > 0)
return -EINVAL;

if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG)
return zoran_try_fmt_vid_out(file, fh, fmt);

Expand Down

0 comments on commit 9f1b9ef

Please sign in to comment.