diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-27 07:14:56 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-27 07:14:56 -0300 |
commit | a2161a6ec00e6f73b7dfdd795062c53c1671bd0e (patch) | |
tree | 0a377ff5127a141460463d9bf6d3aaa166f81573 /linux/drivers/media | |
parent | 8131e5c6eb2069ad322f8432604f69e9452c1ae7 (diff) | |
parent | 3d93e47b381c2726960239773bcd2b161a1143b9 (diff) | |
download | mediapointer-dvb-s2-a2161a6ec00e6f73b7dfdd795062c53c1671bd0e.tar.gz mediapointer-dvb-s2-a2161a6ec00e6f73b7dfdd795062c53c1671bd0e.tar.bz2 |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.c b/linux/drivers/media/video/ivtv/ivtv-driver.c index 56ae17af3..320bf39cb 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.c +++ b/linux/drivers/media/video/ivtv/ivtv-driver.c @@ -703,6 +703,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; |