diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-04-13 16:41:52 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-04-13 16:41:52 -0400 |
| commit | 27f958661fe4bcefb4a51e4afad99c3adebd1993 (patch) | |
| tree | 61d91e45e5910afa3bfca1cd18decacf1d7a6423 | |
| parent | 0bbcd2e449bc5a2096a93314b888344ee2648693 (diff) | |
| download | mediapointer-dvb-s2-27f958661fe4bcefb4a51e4afad99c3adebd1993.tar.gz mediapointer-dvb-s2-27f958661fe4bcefb4a51e4afad99c3adebd1993.tar.bz2 | |
cx88-blackbird: allow proper detection of PAL vs. NTSC video standard
From: Michael Krufky <mkrufky@linuxtv.org>
- removed test for CX88_BOARD_HAUPPAUGE_ROSLYN prior to determining whether
the video standard in use is NTSC or PAL.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-blackbird.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c index 6fe32a92a..b4a13f1e5 100644 --- a/linux/drivers/media/video/cx88/cx88-blackbird.c +++ b/linux/drivers/media/video/cx88/cx88-blackbird.c @@ -1719,16 +1719,12 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev, memcpy(&dev->params,&default_mpeg_params,sizeof(default_mpeg_params)); memcpy(&dev->dnr_params,&default_dnr_params,sizeof(default_dnr_params)); - if (core->board == CX88_BOARD_HAUPPAUGE_ROSLYN) { - - if (core->tuner_formats & V4L2_STD_525_60) { - dev->height = 480; - dev->params.vi_frame_rate = 30; - } else { - dev->height = 576; - dev->params.vi_frame_rate = 25; - } - + if (core->tuner_formats & V4L2_STD_525_60) { + dev->height = 480; + dev->params.vi_frame_rate = 30; + } else { + dev->height = 576; + dev->params.vi_frame_rate = 25; } err = cx8802_init_common(dev); |