diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-27 00:08:52 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-27 00:08:52 -0300 |
commit | 3ed33c31a7253f2b29a3813b66bf87985d3396ac (patch) | |
tree | a08dabfa2ad6330fb8334e60c5ecbb12c8cb72fd /drivers | |
parent | 41f38b43e0bfbb2ba1ef3c778f376dad8820b214 (diff) | |
download | blackbird-op-linux-3ed33c31a7253f2b29a3813b66bf87985d3396ac.tar.gz blackbird-op-linux-3ed33c31a7253f2b29a3813b66bf87985d3396ac.zip |
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 <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/v4l2-common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index a241bf7e92ca..4908dab2df18 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 */ |