diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-19 23:59:42 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-19 23:59:42 +0200 |
| commit | 1808b8dd0052d2ba4d3c7831dfd3fbe135935581 (patch) | |
| tree | c6c6790e7a4a3f4f63637e344dae57783a200967 /linux/drivers/media/video/ivtv/ivtv-streams.c | |
| parent | 8a6d57d665385ce55fc31b961e424185ecd3b4ae (diff) | |
| download | mediapointer-dvb-s2-1808b8dd0052d2ba4d3c7831dfd3fbe135935581.tar.gz mediapointer-dvb-s2-1808b8dd0052d2ba4d3c7831dfd3fbe135935581.tar.bz2 | |
ivtv: add VIDIOC_OVERLAY
From: Hans Verkuil <hverkuil@xs4all.nl>
Add VIDIOC_OVERLAY to enable/disable the OSD. Also add the OSD state to the
log status report.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-streams.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-streams.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-streams.c b/linux/drivers/media/video/ivtv/ivtv-streams.c index 65fa247e3..ebf925c54 100644 --- a/linux/drivers/media/video/ivtv/ivtv-streams.c +++ b/linux/drivers/media/video/ivtv/ivtv-streams.c @@ -75,7 +75,7 @@ static struct { struct file_operations *fops; } ivtv_stream_info[] = { { /* IVTV_ENC_STREAM_TYPE_MPG */ - "encoder MPEG", + "encoder MPG", VFL_TYPE_GRABBER, 0, PCI_DMA_FROMDEVICE, 0, V4L2_BUF_TYPE_VIDEO_CAPTURE, &ivtv_v4l2_enc_fops @@ -93,7 +93,7 @@ static struct { &ivtv_v4l2_enc_fops }, { /* IVTV_ENC_STREAM_TYPE_PCM */ - "encoder PCM audio", + "encoder PCM", VFL_TYPE_GRABBER, IVTV_V4L2_ENC_PCM_OFFSET, PCI_DMA_FROMDEVICE, 0, V4L2_BUF_TYPE_PRIVATE, &ivtv_v4l2_enc_fops @@ -105,7 +105,7 @@ static struct { &ivtv_v4l2_enc_fops }, { /* IVTV_DEC_STREAM_TYPE_MPG */ - "decoder MPEG", + "decoder MPG", VFL_TYPE_GRABBER, IVTV_V4L2_DEC_MPG_OFFSET, PCI_DMA_TODEVICE, 0, V4L2_BUF_TYPE_VIDEO_OUTPUT, &ivtv_v4l2_dec_fops |