From: Mauro Carvalho Chehab Date: Mon, 27 Feb 2006 03:08:52 +0000 (-0300) Subject: V4L/DVB (3372): Fix a small bug when constructing fps and line numbers X-Git-Tag: v2.6.17-rc1~1183^2~87 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3ed33c31a7253f2b29a3813b66bf87985d3396ac;p=linux-2.6-omap-h63xx.git V4L/DVB (3372): Fix a small bug when constructing fps and line numbers Previously, only NTSC and PAL/M were associated to 30fps and 525 lines, so, PAL/60 were not handled properly. Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index a241bf7e92c..4908dab2df1 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c @@ -97,7 +97,7 @@ int v4l2_video_std_construct(struct v4l2_standard *vs, memset(vs, 0, sizeof(struct v4l2_standard)); vs->index = index; vs->id = id; - if (id & (V4L2_STD_NTSC | V4L2_STD_PAL_M)) { + if (id & V4L2_STD_525_60) { vs->frameperiod.numerator = 1001; vs->frameperiod.denominator = 30000; vs->framelines = 525; @@ -110,7 +110,6 @@ int v4l2_video_std_construct(struct v4l2_standard *vs, return 0; } - /* ----------------------------------------------------------------- */ /* priority handling */