diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-28 19:41:55 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-28 19:41:55 -0300 |
| commit | ba369d468ab5439d1b514a0c52eca6b6e3186211 (patch) | |
| tree | aaa5000a10ab4a6c6f61a8e541490b6118628174 /linux/drivers/media/video/cx18/cx18-controls.c | |
| parent | b89992af37003880352126bda1bb2b60cac85b5d (diff) | |
| parent | 65877f260b6716f91d4cd687d28c1d1a3f21b470 (diff) | |
| download | mediapointer-dvb-s2-ba369d468ab5439d1b514a0c52eca6b6e3186211.tar.gz mediapointer-dvb-s2-ba369d468ab5439d1b514a0c52eca6b6e3186211.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-controls.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-controls.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-controls.c b/linux/drivers/media/video/cx18/cx18-controls.c index 82fc2f9d4..8e35c3aed 100644 --- a/linux/drivers/media/video/cx18/cx18-controls.c +++ b/linux/drivers/media/video/cx18/cx18-controls.c @@ -176,8 +176,10 @@ static int cx18_setup_vbi_fmt(struct cx18 *cx, return -EBUSY; if (fmt != V4L2_MPEG_STREAM_VBI_FMT_IVTV || - type != V4L2_MPEG_STREAM_TYPE_MPEG2_PS) { - /* We don't do VBI insertion aside from IVTV format in a PS */ + !(type == V4L2_MPEG_STREAM_TYPE_MPEG2_PS || + type == V4L2_MPEG_STREAM_TYPE_MPEG2_DVD || + type == V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD)) { + /* Only IVTV fmt VBI insertion & only MPEG-2 PS type streams */ cx->vbi.insert_mpeg = V4L2_MPEG_STREAM_VBI_FMT_NONE; CX18_DEBUG_INFO("disabled insertion of sliced VBI data into " "the MPEG stream\n"); |