summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-12-13 06:35:26 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 19:03:33 -0200
commit784c668b24dede8acd7044b490a538b5b6cd6b20 (patch)
tree6d460acd0442820a99b55e18b34fdb324c221e84 /drivers
parent63736784f73e7c38b2bad5ed3ed783dc102ba01e (diff)
V4L/DVB (6806): Allow emulating changes of video std by vivi
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/vivi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 2bbefd926256..0b5c1426bb90 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -919,7 +919,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
return -EINVAL;
inp->type = V4L2_INPUT_TYPE_CAMERA;
- inp->std = V4L2_STD_NTSC_M;
+ inp->std = V4L2_STD_525_60;
strcpy(inp->name, "Camera");
return (0);
@@ -1172,7 +1172,7 @@ static struct video_device vivi_template = {
#ifdef CONFIG_VIDEO_V4L1_COMPAT
.vidiocgmbuf = vidiocgmbuf,
#endif
- .tvnorms = V4L2_STD_NTSC_M,
+ .tvnorms = V4L2_STD_525_60,
.current_norm = V4L2_STD_NTSC_M,
};
/* -----------------------------------------------------------------