diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-18 08:02:40 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-18 08:02:40 -0200 |
| commit | 9730e168922552fa3f337e985ac02b7a2fa95faf (patch) | |
| tree | 2de090f6aa5251ed96ee28f3f2981551221ebd9d /linux/drivers/media | |
| parent | a39dc733f86986e36db66c1e5b680258418b0852 (diff) | |
| download | mediapointer-dvb-s2-9730e168922552fa3f337e985ac02b7a2fa95faf.tar.gz mediapointer-dvb-s2-9730e168922552fa3f337e985ac02b7a2fa95faf.tar.bz2 | |
Fix a small bug when constructing fps and line numbers
From: Mauro Carvalho Chehab <mchehab@infradead.org>
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 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/v4l2-common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c index 26a4d0303..2df9b70c5 100644 --- a/linux/drivers/media/video/v4l2-common.c +++ b/linux/drivers/media/video/v4l2-common.c @@ -115,7 +115,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; @@ -128,7 +128,6 @@ int v4l2_video_std_construct(struct v4l2_standard *vs, return 0; } - /* ----------------------------------------------------------------- */ /* priority handling */ |