From: Mauro Carvalho Chehab Date: Thu, 13 Dec 2007 09:35:26 +0000 (-0300) Subject: V4L/DVB (6806): Allow emulating changes of video std by vivi X-Git-Tag: v2.6.25-rc1~1235^2~206 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=784c668b24dede8acd7044b490a538b5b6cd6b20;p=linux-2.6 V4L/DVB (6806): Allow emulating changes of video std by vivi Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 2bbefd9262..0b5c1426bb 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, }; /* -----------------------------------------------------------------