The patch number 10707 was added via Hans Verkuil <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Hans Verkuil <[email protected]>
zoran: set bytesperline to 0 when using MJPEG.
Remove bogus check on bytesperline in the try_fmt_vid_out call.
Just set it to 0.
Priority: normal
Signed-off-by: Hans Verkuil <[email protected]>
---
linux/drivers/media/video/zoran/zoran_driver.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff -r a3616a109c38 -r 597513b6c850
linux/drivers/media/video/zoran/zoran_driver.c
--- a/linux/drivers/media/video/zoran/zoran_driver.c Wed Feb 18 17:24:56
2009 +0100
+++ b/linux/drivers/media/video/zoran/zoran_driver.c Wed Feb 18 17:28:28
2009 +0100
@@ -2550,11 +2550,10 @@ static int zoran_try_fmt_vid_out(struct
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;
@@ -2608,9 +2607,6 @@ static int zoran_try_fmt_vid_cap(struct
struct zoran_fh *fh = __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);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/597513b6c85012fe4bc471dca13f6b58adae6bc0
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
