Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 87537
b: refs/heads/master
c: 165e121
h: refs/heads/master
i:
  87535: 6c85178
v: v3
  • Loading branch information
Ian Armstrong authored and Mauro Carvalho Chehab committed Mar 20, 2008
1 parent daac414 commit 57ecc7c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c030f5e697af1127002a0aeffcd259f9bcff5471
refs/heads/master: 165e1213e13b49761f8b3fd9314701f83cf3db3a
3 changes: 3 additions & 0 deletions trunk/drivers/media/video/ivtv/ivtv-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,9 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv)
itv->vbi.in.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;
itv->vbi.sliced_in = &itv->vbi.in.fmt.sliced;

/* Init the sg table for osd/yuv output */
sg_init_table(itv->udma.SGlist, IVTV_DMA_SG_OSD_ENT);

/* OSD */
itv->osd_global_alpha_state = 1;
itv->osd_global_alpha = 255;
Expand Down

0 comments on commit 57ecc7c

Please sign in to comment.