]> err.no Git - linux-2.6/commitdiff
V4L/DVB (5967): ivtv: fix VIDIOC_S_FBUF:new OSD values where never set
authorHans Verkuil <hverkuil@xs4all.nl>
Tue, 31 Jul 2007 10:15:56 +0000 (07:15 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 20 Aug 2007 15:18:02 +0000 (12:18 -0300)
ivtv: fix VIDIOC_S_FBUF support: new OSD values where never actually set.

The values set with VIDIOC_S_FBUF were not actually used until the next
VIDIOC_S_FMT. Fixed.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/ivtv/ivtv-ioctl.c

index 047624b9e2717f0ded7af8e2403e908ee60c3091..f2310b775fad0d2c497375179f3d7f30cf26fbfb 100644 (file)
@@ -1190,6 +1190,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
                itv->osd_global_alpha_state = (fb->flags & V4L2_FBUF_FLAG_GLOBAL_ALPHA) != 0;
                itv->osd_local_alpha_state = (fb->flags & V4L2_FBUF_FLAG_LOCAL_ALPHA) != 0;
                itv->osd_color_key_state = (fb->flags & V4L2_FBUF_FLAG_CHROMAKEY) != 0;
+               ivtv_set_osd_alpha(itv);
                break;
        }