mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-05-14 17:55:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow static image as camera source

Browse Source
This commit is contained in:
Mr-Dave
2022-03-25 22:01:22 -06:00
parent c1c8755ea2
commit 4b66019a89
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/movie.cpp
View File

@@ -1422,8 +1422,9 @@ void movie_avcodec_log(void *ignoreme, int errno_flag, const char *fmt, va_list
if (end > buf && end[-1] == '\n') {
*--end = 0;
}
MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO, "%s", buf);
if (strstr(buf, "Will reconnect at") == NULL) {
MOTION_LOG(INF, TYPE_ENCODER, NO_ERRNO, "%s", buf);
}
}
}

5
src/netcam.cpp
View File

@@ -1393,6 +1393,11 @@ static void netcam_set_options(struct ctx_netcam *netcam)
MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO
,_("%s: Setting input_format mjpeg"),netcam->cameratype);
netcam->format_context->iformat = av_find_input_format("mjpeg");
util_parms_add_default(netcam->params,"reconnect_on_network_error","1");
util_parms_add_default(netcam->params,"reconnect_at_eof","1");
util_parms_add_default(netcam->params,"reconnect","1");
util_parms_add_default(netcam->params,"multiple_requests","1");
util_parms_add_default(netcam->params,"reconnect_streamed","1");
} else if (mystreq(netcam->service, "v4l2")) {
MOTION_LOG(INF, TYPE_NETCAM, NO_ERRNO