diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-28 19:45:20 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-28 19:45:20 -0300 |
| commit | b254ef22ff520250431995106e98ce08a9cd0af2 (patch) | |
| tree | 4e730e629127c5ceaef2f24c45f4d2857289c3a0 /linux/drivers/media/video/cx18/cx18-controls.c | |
| parent | 931c58dd0134b10194c570d8e5d47f774dd6fb5d (diff) | |
| parent | ba369d468ab5439d1b514a0c52eca6b6e3186211 (diff) | |
| download | mediapointer-dvb-s2-b254ef22ff520250431995106e98ce08a9cd0af2.tar.gz mediapointer-dvb-s2-b254ef22ff520250431995106e98ce08a9cd0af2.tar.bz2 | |
merge: http://linuxtv.org/hg/~dheitmueller/v4l-dvb-dvicofix
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"); |