diff options
| author | Ian Armstrong <ian@iarmst.demon.co.uk> | 2008-10-06 03:06:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-13 09:08:24 -0200 |
| commit | ec9faa1cfac1dd64a2a865dc7c577f3d483656bd (patch) | |
| tree | 8f50ce6b5637fe28b75ec157f698066910fc0486 | |
| parent | 4ee0e42b31b282d0d0bb11effbbeb0610ee76d09 (diff) | |
V4L/DVB (9165): ivtv: V4L2_FBUF_FLAG_OVERLAY status fix
When the framebuffer format was queried via VIDIOC_G_FBUF,
V4L2_FBUF_FLAG_OVERLAY would only be correctly returned for certain screen
depths.
Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-ioctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index 3d0013bdd1fd..3c2628a63015 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/drivers/media/video/ivtv/ivtv-ioctl.c @@ -1363,6 +1363,9 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb) if (itv->osd_global_alpha_state) fb->flags |= V4L2_FBUF_FLAG_GLOBAL_ALPHA; + if (yi->track_osd) + fb->flags |= V4L2_FBUF_FLAG_OVERLAY; + pixfmt &= 7; /* no local alpha for RGB565 or unknown formats */ @@ -1382,8 +1385,6 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb) else fb->flags |= V4L2_FBUF_FLAG_LOCAL_ALPHA; } - if (yi->track_osd) - fb->flags |= V4L2_FBUF_FLAG_OVERLAY; return 0; } |