diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/cx18/cx18-driver.c | 8 | ||||
| -rw-r--r-- | drivers/media/video/cx18/cx18-driver.h | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index fcc40bf37f2..f3b0c946d45 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c @@ -884,13 +884,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/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h index 5e1ae91d532..ece4f281ef4 100644 --- a/drivers/media/video/cx18/cx18-driver.h +++ b/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) */ }; |