diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-14 01:11:29 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-14 01:11:29 -0200 |
commit | a8b91214d1d10d63bca3f2f9f8d4670f46a0b782 (patch) | |
tree | a66ea5b43a176a253b5722c3fb1c6e9b23e5fb5d /linux/drivers/media/video/cx18/cx18-vbi.c | |
parent | 97b478e31ccddc358a73628542bb2d32983abeac (diff) | |
parent | 61a2de789c256e6a8c6c184ed07b18f06b19e1dd (diff) | |
download | mediapointer-dvb-s2-a8b91214d1d10d63bca3f2f9f8d4670f46a0b782.tar.gz mediapointer-dvb-s2-a8b91214d1d10d63bca3f2f9f8d4670f46a0b782.tar.bz2 |
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-vbi.c')
-rw-r--r-- | linux/drivers/media/video/cx18/cx18-vbi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-vbi.c b/linux/drivers/media/video/cx18/cx18-vbi.c index 22e76ee3f..fb595bd54 100644 --- a/linux/drivers/media/video/cx18/cx18-vbi.c +++ b/linux/drivers/media/video/cx18/cx18-vbi.c @@ -160,11 +160,14 @@ void cx18_process_vbi_data(struct cx18 *cx, struct cx18_buffer *buf, return; /* Raw VBI data */ - if (cx->vbi.sliced_in->service_set == 0) { + if (cx18_raw_vbi(cx)) { u8 type; cx18_buf_swap(buf); + /* Skip 12 bytes of header that gets stuffed in */ + size -= 12; + memcpy(p, &buf->buf[12], size); type = p[3]; size = buf->bytesused = compress_raw_buf(cx, p, size); |