From 04590c05dcf06d872195ada3abf53b1977d03f0e Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 27 Nov 2009 13:55:21 -0200 Subject: [PATCH] --- yaml --- r: 174199 b: refs/heads/master c: fb3de0398ab1bf270bc55f66945f82e61e50f6b6 h: refs/heads/master i: 174197: b616a8445a3d28ad68045b1b6c2edf80cdc9cb51 174195: cced65636357a3b773cc1925f43d948426791662 174191: 09286a5eeaddff01d9ff9e914703309a3b1eff80 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-video.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b3b1b1fdaada..8ac496d21984 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0731160aca15df5882387e07d61671e6746c658f +refs/heads/master: fb3de0398ab1bf270bc55f66945f82e61e50f6b6 diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c index fbe536f092f9..7ad65370f274 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-video.c +++ b/trunk/drivers/media/video/em28xx/em28xx-video.c @@ -1060,12 +1060,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, /* the em2800 can only scale down to 50% */ height = height > (3 * maxh / 4) ? maxh : maxh / 2; width = width > (3 * maxw / 4) ? maxw : maxw / 2; - /* According to empiatech support the MaxPacketSize is too small - * to support framesizes larger than 640x480 @ 30 fps or 640x576 - * @ 25 fps. As this would cut of a part of the image we prefer - * 360x576 or 360x480 for now */ - if (width == maxw && height == maxh) - width /= 2; } else { /* width must even because of the YUYV format height must be even because of interlacing */