diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-26 22:08:52 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-26 22:08:52 -0500 |
commit | 3ed33c31a7253f2b29a3813b66bf87985d3396ac (patch) | |
tree | a08dabfa2ad6330fb8334e60c5ecbb12c8cb72fd /drivers/media/video/v4l2-common.c | |
parent | 41f38b43e0bfbb2ba1ef3c778f376dad8820b214 (diff) |
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/media/video/v4l2-common.c')
-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, | |||
97 | memset(vs, 0, sizeof(struct v4l2_standard)); | 97 | memset(vs, 0, sizeof(struct v4l2_standard)); |
98 | vs->index = index; | 98 | vs->index = index; |
99 | vs->id = id; | 99 | vs->id = id; |
100 | if (id & (V4L2_STD_NTSC | V4L2_STD_PAL_M)) { | 100 | if (id & V4L2_STD_525_60) { |
101 | vs->frameperiod.numerator = 1001; | 101 | vs->frameperiod.numerator = 1001; |
102 | vs->frameperiod.denominator = 30000; | 102 | vs->frameperiod.denominator = 30000; |
103 | vs->framelines = 525; | 103 | vs->framelines = 525; |
@@ -110,7 +110,6 @@ int v4l2_video_std_construct(struct v4l2_standard *vs, | |||
110 | return 0; | 110 | return 0; |
111 | } | 111 | } |
112 | 112 | ||
113 | |||
114 | /* ----------------------------------------------------------------- */ | 113 | /* ----------------------------------------------------------------- */ |
115 | /* priority handling */ | 114 | /* priority handling */ |
116 | 115 | ||