diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-10-06 08:06:08 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-10-06 08:06:08 +0200 |
| commit | 12b75f712b18acee64dd614a79b2b0dd3c7c581d (patch) | |
| tree | 8294f835b0e55d1f2447ee66591351f803e9c9b5 /linux/drivers/media | |
| parent | b88e2318f7414d5291e18a93bd409465a81b2fa9 (diff) | |
| download | mediapointer-dvb-s2-12b75f712b18acee64dd614a79b2b0dd3c7c581d.tar.gz mediapointer-dvb-s2-12b75f712b18acee64dd614a79b2b0dd3c7c581d.tar.bz2 | |
ivtv: V4L2_FBUF_FLAG_OVERLAY status fix
From: Ian Armstrong <ian@iarmst.demon.co.uk>
When the framebuffer format was queried via VIDIOC_G_FBUF,
V4L2_FBUF_FLAG_OVERLAY would only be correctly returned for certain screen
depths.
Priority: normal
Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-ioctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-ioctl.c b/linux/drivers/media/video/ivtv/ivtv-ioctl.c index 3d0013bdd..3c2628a63 100644 --- a/linux/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/linux/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; } |