diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-streams.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-streams.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c index 65fa247e33c5..ebf925c549fd 100644 --- a/drivers/media/video/ivtv/ivtv-streams.c +++ b/drivers/media/video/ivtv/ivtv-streams.c | |||
@@ -75,7 +75,7 @@ static struct { | |||
75 | struct file_operations *fops; | 75 | struct file_operations *fops; |
76 | } ivtv_stream_info[] = { | 76 | } ivtv_stream_info[] = { |
77 | { /* IVTV_ENC_STREAM_TYPE_MPG */ | 77 | { /* IVTV_ENC_STREAM_TYPE_MPG */ |
78 | "encoder MPEG", | 78 | "encoder MPG", |
79 | VFL_TYPE_GRABBER, 0, | 79 | VFL_TYPE_GRABBER, 0, |
80 | PCI_DMA_FROMDEVICE, 0, V4L2_BUF_TYPE_VIDEO_CAPTURE, | 80 | PCI_DMA_FROMDEVICE, 0, V4L2_BUF_TYPE_VIDEO_CAPTURE, |
81 | &ivtv_v4l2_enc_fops | 81 | &ivtv_v4l2_enc_fops |
@@ -93,7 +93,7 @@ static struct { | |||
93 | &ivtv_v4l2_enc_fops | 93 | &ivtv_v4l2_enc_fops |
94 | }, | 94 | }, |
95 | { /* IVTV_ENC_STREAM_TYPE_PCM */ | 95 | { /* IVTV_ENC_STREAM_TYPE_PCM */ |
96 | "encoder PCM audio", | 96 | "encoder PCM", |
97 | VFL_TYPE_GRABBER, IVTV_V4L2_ENC_PCM_OFFSET, | 97 | VFL_TYPE_GRABBER, IVTV_V4L2_ENC_PCM_OFFSET, |
98 | PCI_DMA_FROMDEVICE, 0, V4L2_BUF_TYPE_PRIVATE, | 98 | PCI_DMA_FROMDEVICE, 0, V4L2_BUF_TYPE_PRIVATE, |
99 | &ivtv_v4l2_enc_fops | 99 | &ivtv_v4l2_enc_fops |
@@ -105,7 +105,7 @@ static struct { | |||
105 | &ivtv_v4l2_enc_fops | 105 | &ivtv_v4l2_enc_fops |
106 | }, | 106 | }, |
107 | { /* IVTV_DEC_STREAM_TYPE_MPG */ | 107 | { /* IVTV_DEC_STREAM_TYPE_MPG */ |
108 | "decoder MPEG", | 108 | "decoder MPG", |
109 | VFL_TYPE_GRABBER, IVTV_V4L2_DEC_MPG_OFFSET, | 109 | VFL_TYPE_GRABBER, IVTV_V4L2_DEC_MPG_OFFSET, |
110 | PCI_DMA_TODEVICE, 0, V4L2_BUF_TYPE_VIDEO_OUTPUT, | 110 | PCI_DMA_TODEVICE, 0, V4L2_BUF_TYPE_VIDEO_OUTPUT, |
111 | &ivtv_v4l2_dec_fops | 111 | &ivtv_v4l2_dec_fops |