Skip to content

Commit

Permalink
V4L/DVB (3806): Cx88-blackbird: allow proper detection of PAL vs. NTS…
Browse files Browse the repository at this point in the history
…C video standard

- removed test for CX88_BOARD_HAUPPAUGE_ROSLYN prior to determining whether
  the video standard in use is NTSC or PAL.
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Michael Krufky authored and Mauro Carvalho Chehab committed Jun 25, 2006
1 parent 473f542 commit 707f813
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions drivers/media/video/cx88/cx88-blackbird.c
Original file line number Diff line number Diff line change
Expand Up @@ -1686,16 +1686,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);
Expand Down

0 comments on commit 707f813

Please sign in to comment.