aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/ivtv/ivtv-ioctl.c5
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 3d0013bdd1f..3c2628a6301 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)
1363 if (itv->osd_global_alpha_state) 1363 if (itv->osd_global_alpha_state)
1364 fb->flags |= V4L2_FBUF_FLAG_GLOBAL_ALPHA; 1364 fb->flags |= V4L2_FBUF_FLAG_GLOBAL_ALPHA;
1365 1365
1366 if (yi->track_osd)
1367 fb->flags |= V4L2_FBUF_FLAG_OVERLAY;
1368
1366 pixfmt &= 7; 1369 pixfmt &= 7;
1367 1370
1368 /* no local alpha for RGB565 or unknown formats */ 1371 /* 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)
1382 else 1385 else
1383 fb->flags |= V4L2_FBUF_FLAG_LOCAL_ALPHA; 1386 fb->flags |= V4L2_FBUF_FLAG_LOCAL_ALPHA;
1384 } 1387 }
1385 if (yi->track_osd)
1386 fb->flags |= V4L2_FBUF_FLAG_OVERLAY;
1387 1388
1388 return 0; 1389 return 0;
1389} 1390}