mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-02-06 21:11:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Camera Type

Browse Source 
Loosen the names permitted for videodevice
This commit is contained in:
MrDave
2017-03-02 18:44:36 -07:00
parent ede7a0bccf
commit 669e531881
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
motion.c
View File

@@ -720,13 +720,6 @@ static int init_camera_type(struct context *cnt){
return 0;
}
#ifdef HAVE_V4L2
if (strncmp(cnt->conf.video_device,"/dev/video",10) == 0) {
cnt->camera_type = CAMERA_TYPE_V4L2;
return 0;
}
#endif // HAVE_V4L2
#ifdef HAVE_BKTR
if (strncmp(cnt->conf.video_device,"/dev/bktr",9) == 0) {
cnt->camera_type = CAMERA_TYPE_BKTR;
@@ -734,6 +727,14 @@ static int init_camera_type(struct context *cnt){
}
#endif // HAVE_BKTR
#ifdef HAVE_V4L2
if (cnt->conf.video_device) {
cnt->camera_type = CAMERA_TYPE_V4L2;
return 0;
}
#endif // HAVE_V4L2
MOTION_LOG(ERR, TYPE_ALL, NO_ERRNO, "%s: Unable to determine camera type (MMAL, Netcam, V4L2, BKTR)");
return -1;