summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-12-13 07:35:26 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-12-13 07:35:26 -0200
commit9fe6aa61dbfbf8b7dd7570323e9283829201465a (patch)
tree8ce51de9d10a3e2b6ab259c89f6ef32a2dd2e5d8
parentf1e07f7f29ad59ec31f9ad2e7acd6afb80724a85 (diff)
downloadmediapointer-dvb-s2-9fe6aa61dbfbf8b7dd7570323e9283829201465a.tar.gz
mediapointer-dvb-s2-9fe6aa61dbfbf8b7dd7570323e9283829201465a.tar.bz2
Allow emulating changes of video std by vivi
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--linux/drivers/media/video/vivi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/vivi.c b/linux/drivers/media/video/vivi.c
index 02e44ab91..521edd1ba 100644
--- a/linux/drivers/media/video/vivi.c
+++ b/linux/drivers/media/video/vivi.c
@@ -992,7 +992,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);
@@ -1245,7 +1245,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,
};
/* -----------------------------------------------------------------