diff options
| author | Andy Walls <awalls@radix.net> | 2009-02-21 20:35:11 -0500 |
|---|---|---|
| committer | Andy Walls <awalls@radix.net> | 2009-02-21 20:35:11 -0500 |
| commit | 97b6650400d95e282abd26f105df2df79ea94435 (patch) | |
| tree | 7f33b50f8e359a07689f004908c5b308aa9ff96b /linux/drivers/media/video/cx18 | |
| parent | 357ef82d840606fc7f61d134b14f508a8f25cd64 (diff) | |
| download | mediapointer-dvb-s2-97b6650400d95e282abd26f105df2df79ea94435.tar.gz mediapointer-dvb-s2-97b6650400d95e282abd26f105df2df79ea94435.tar.bz2 | |
cx18: Get rid of unused variables related to video output
From: Andy Walls <awalls@radix.net>
Remove variables that were holdovers from ivtv for supporting the CX23415
MPEG decoder output.
Priority: normal
Signed-off-by: Andy Walls <awalls@radix.net>
Diffstat (limited to 'linux/drivers/media/video/cx18')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.h | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.c b/linux/drivers/media/video/cx18/cx18-driver.c index 8211c4ae1..d2915f08c 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.c +++ b/linux/drivers/media/video/cx18/cx18-driver.c @@ -889,13 +889,11 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev, cx18_init_subdevs(cx); - if (cx->std & V4L2_STD_525_60) { + if (cx->std & V4L2_STD_525_60) cx->is_60hz = 1; - cx->is_out_60hz = 1; - } else { + else cx->is_50hz = 1; - cx->is_out_50hz = 1; - } + cx->params.video_gop_size = cx->is_60hz ? 15 : 12; if (cx->options.radio > 0) diff --git a/linux/drivers/media/video/cx18/cx18-driver.h b/linux/drivers/media/video/cx18/cx18-driver.h index 5e1ae91d5..ece4f281e 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.h +++ b/linux/drivers/media/video/cx18/cx18-driver.h @@ -505,8 +505,6 @@ struct cx18 { const struct cx18_card_tuner_i2c *card_i2c; /* i2c addresses to probe for tuner */ u8 is_50hz; u8 is_60hz; - u8 is_out_50hz; /* FIXME - remove, we don't have an output decoder */ - u8 is_out_60hz; /* FIXME - remove, we don't have an output decoder */ u8 nof_inputs; /* number of video inputs */ u8 nof_audio_inputs; /* number of audio inputs */ u16 buffer_id; /* buffer ID counter */ @@ -591,7 +589,6 @@ struct cx18 { /* codec settings */ u32 audio_input; u32 active_input; - u32 active_output; v4l2_std_id std; v4l2_std_id tuner_std; /* The norm of the tuner (fixed) */ }; |