V4L/DVB (3372): Fix a small bug when constructing fps and line numbers
authorMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 27 Feb 2006 03:08:52 +0000 (00:08 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 27 Feb 2006 03:08:52 +0000 (00:08 -0300)
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 <mchehab@infradead.org>
drivers/media/video/v4l2-common.c

index a241bf7e92cad6883f6f7e79bf130c8f79133f81..4908dab2df186aed609d66ef1d48467b1126f9f8 100644 (file)
@@ -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                                                 */