aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-blackbird.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-04-16 11:17:34 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 00:58:11 -0400
commit3febc04d42d4a0bda64af0c929fdb871370e2a7a (patch)
tree40e06584337e9f4893576186a1599857fd795270 /drivers/media/video/cx88/cx88-blackbird.c
parent1b77c54ee11ebe36ce4d0fe805e50aaafa6304b4 (diff)
V4L/DVB (3810): KWorld HardwareMpegTV XPert: Enable Blackbird MPEG encoder support
- clear I2SIN to deliver the audio stream to the cx23416 mpeg encoder. - enable blackbird support on the KWorld HardwareMpegTV XPert Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-blackbird.c')
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 6ec4a34aeacc..75ee8358f1cb 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1686,12 +1686,16 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
1686 memcpy(&dev->params,&default_mpeg_params,sizeof(default_mpeg_params)); 1686 memcpy(&dev->params,&default_mpeg_params,sizeof(default_mpeg_params));
1687 memcpy(&dev->dnr_params,&default_dnr_params,sizeof(default_dnr_params)); 1687 memcpy(&dev->dnr_params,&default_dnr_params,sizeof(default_dnr_params));
1688 1688
1689 if (core->tuner_formats & V4L2_STD_525_60) { 1689 if (core->board == CX88_BOARD_HAUPPAUGE_ROSLYN) {
1690 dev->height = 480; 1690
1691 dev->params.vi_frame_rate = 30; 1691 if (core->tuner_formats & V4L2_STD_525_60) {
1692 } else { 1692 dev->height = 480;
1693 dev->height = 576; 1693 dev->params.vi_frame_rate = 30;
1694 dev->params.vi_frame_rate = 25; 1694 } else {
1695 dev->height = 576;
1696 dev->params.vi_frame_rate = 25;
1697 }
1698
1695 } 1699 }
1696 1700
1697 err = cx8802_init_common(dev); 1701 err = cx8802_init_common(dev);