From cf9757305a4e063f26ad7de446e4acbf67b2108a Mon Sep 17 00:00:00 2001 From: Ian Armstrong Date: Mon, 6 Oct 2008 03:06:08 -0300 Subject: [PATCH] --- yaml --- r: 114087 b: refs/heads/master c: ec9faa1cfac1dd64a2a865dc7c577f3d483656bd h: refs/heads/master i: 114085: c890607fc3c52b5296eadb43aa46f55b786f829c 114083: 4f6243e0ecff1eaa4ce5c6b47313ec17737d2b79 114079: 0975d6d590b954eaad31fde838b3a353f765a275 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-ioctl.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 615ed10993aa..057451c33a17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ee0e42b31b282d0d0bb11effbbeb0610ee76d09 +refs/heads/master: ec9faa1cfac1dd64a2a865dc7c577f3d483656bd diff --git a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c b/trunk/drivers/media/video/ivtv/ivtv-ioctl.c index 3d0013bdd1fd..3c2628a63015 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/trunk/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; }