diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-27 07:19:13 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-27 07:19:13 -0300 |
| commit | a30b99a444271720aac9c4b900fded08f2caf0b2 (patch) | |
| tree | d71b0a94a820b135edea12b2c04838cbd44c6305 /linux/drivers/media/video/ivtv/ivtv-driver.c | |
| parent | 007d0d0ba0215cb8458d07da941c4bb2f4842cb1 (diff) | |
| parent | 7cc61109ba84b617325299f34efd62fd0ba8e399 (diff) | |
| download | mediapointer-dvb-s2-a30b99a444271720aac9c4b900fded08f2caf0b2.tar.gz mediapointer-dvb-s2-a30b99a444271720aac9c4b900fded08f2caf0b2.tar.bz2 | |
merge: http://linuxtv.org/hg/~dougsland/v4l-dma/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-driver.c')
| -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; |