diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-12-15 10:32:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-02-14 13:44:41 -0200 |
| commit | debf80014fc1e8d02b3fd57e5fae0d315ac2cb04 (patch) | |
| tree | b4275b68e02eab7865d5b61fd9ca4ac1ee9408a4 /drivers/media/video/ivtv/ivtv-streams.c | |
| parent | 77bd4c0ff1671214ee026c175b4a5e1cc8776a0a (diff) | |
[media] ivtv: implement new decoder controls
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-streams.c')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-streams.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c index 034c0112431..9cc037c1260 100644 --- a/drivers/media/video/ivtv/ivtv-streams.c +++ b/drivers/media/video/ivtv/ivtv-streams.c @@ -223,7 +223,10 @@ static int ivtv_prep_dev(struct ivtv *itv, int type) s->vdev->num = num; s->vdev->v4l2_dev = &itv->v4l2_dev; - s->vdev->ctrl_handler = itv->v4l2_dev.ctrl_handler; + if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) + s->vdev->ctrl_handler = &itv->hdl_out; + else + s->vdev->ctrl_handler = itv->v4l2_dev.ctrl_handler; s->vdev->fops = ivtv_stream_info[type].fops; s->vdev->release = video_device_release; s->vdev->tvnorms = V4L2_STD_ALL; |