Skip to content

L
linux-davinci
Commit 784c668b authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (6806): Allow emulating changes of video std by vivi 

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 63736784
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/media/video/vivi.c
View file @ 784c668b
...@@ -919,7 +919,7 @@ static int vidioc_enum_input(struct file *file, void *priv, ...@@ -919,7 +919,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
return -EINVAL; return -EINVAL;
inp->type = V4L2_INPUT_TYPE_CAMERA; inp->type = V4L2_INPUT_TYPE_CAMERA;
inp->std = V4L2_STD_NTSC_M; inp->std = V4L2_STD_525_60;
strcpy(inp->name, "Camera"); strcpy(inp->name, "Camera");
return (0); return (0);
...@@ -1172,7 +1172,7 @@ static struct video_device vivi_template = { ...@@ -1172,7 +1172,7 @@ static struct video_device vivi_template = {
#ifdef CONFIG_VIDEO_V4L1_COMPAT #ifdef CONFIG_VIDEO_V4L1_COMPAT
.vidiocgmbuf = vidiocgmbuf, .vidiocgmbuf = vidiocgmbuf,
#endif #endif
.tvnorms = V4L2_STD_NTSC_M, .tvnorms = V4L2_STD_525_60,
.current_norm = V4L2_STD_NTSC_M, .current_norm = V4L2_STD_NTSC_M,
}; };
/* ----------------------------------------------------------------- /* -----------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment