diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-13 10:35:26 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 22:03:33 +0100 |
| commit | 784c668b24dede8acd7044b490a538b5b6cd6b20 (patch) | |
| tree | 6d460acd0442820a99b55e18b34fdb324c221e84 /drivers/media/video/vivi.c | |
| parent | V4L/DVB (6805): video std is a bitmask. Better to print in hexa (diff) | |
| download | linux-784c668b24dede8acd7044b490a538b5b6cd6b20.tar.xz linux-784c668b24dede8acd7044b490a538b5b6cd6b20.zip | |
V4L/DVB (6806): Allow emulating changes of video std by vivi
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/vivi.c')
| -rw-r--r-- | drivers/media/video/vivi.c | 4 |
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, }; /* ----------------------------------------------------------------- |