system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-30 16:29:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] usbvision: fix standards for S-Video/Composite inputs

Browse source 
The standards supported by S-Video and Composite inputs are not
limited by PAL, so make it more generic.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2015-07-20 09:59:37 -03:00 committed by Mauro Carvalho Chehab
parent 8926e84534
commit 94384014f6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/media/usb/usbvision/usbvision-video.c
View file

@ -540,7 +540,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
strcpy(vi->name, "Green Video Input"); strcpy(vi->name, "Green Video Input");
else else
strcpy(vi->name, "Composite Video Input"); strcpy(vi->name, "Composite Video Input");
vi->std = V4L2_STD_PAL; vi->std = USBVISION_NORMS;
break; break;
case 2: case 2:
vi->type = V4L2_INPUT_TYPE_CAMERA; vi->type = V4L2_INPUT_TYPE_CAMERA;
@ -548,12 +548,12 @@ static int vidioc_enum_input(struct file *file, void *priv,
strcpy(vi->name, "Yellow Video Input"); strcpy(vi->name, "Yellow Video Input");
else else
strcpy(vi->name, "S-Video Input"); strcpy(vi->name, "S-Video Input");
vi->std = V4L2_STD_PAL; vi->std = USBVISION_NORMS;
break; break;
case 3: case 3:
vi->type = V4L2_INPUT_TYPE_CAMERA; vi->type = V4L2_INPUT_TYPE_CAMERA;
strcpy(vi->name, "Red Video Input"); strcpy(vi->name, "Red Video Input");
vi->std = V4L2_STD_PAL; vi->std = USBVISION_NORMS;
break; break;
} }
return 0; return 0;