mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-13 00:54:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix merges

Browse Source
This commit is contained in:
Isaac Connor
2018-05-12 19:44:20 -04:00
parent c3053a2f8a
commit d3c95ea144
3 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_camera.cpp
View File

@@ -20,7 +20,6 @@
#include "zm.h"
#include "zm_camera.h"
<<<<<<< HEAD
Camera::Camera(
unsigned int p_monitor_id,
SourceType p_type,
@@ -52,7 +51,6 @@ Camera::Camera(
mVideoCodecContext(NULL),
mAudioCodecContext(NULL),
video_stream(NULL),
record_audio(p_record_audio),
bytes(0)
{
pixels = width * height;

2
src/zm_event.cpp
View File

@@ -203,7 +203,7 @@ Event::Event(
}
}
snprintf(video_name, sizeof(video_name), "%llu-%s.%s", id, "video", container.c_str());
snprintf(video_name, sizeof(video_name), "%" PRIu64 "-%s.%s", id, "video", container.c_str());
snprintf(video_file, sizeof(video_file), staticConfig.video_file_format, path.c_str(), video_name);
Debug(1,"Writing video file to %s", video_file);
Camera * camera = monitor->getCamera();

1
src/zmc.cpp
View File

@@ -267,7 +267,6 @@ int main(int argc, char *argv[]) {
AnalysisThread **analysis_threads = new AnalysisThread *[n_monitors];
int *capture_delays = new int[n_monitors];
int *alarm_capture_delays = new int[n_monitors];
int *next_delays = new int[n_monitors];
struct timeval * last_capture_times = new struct timeval[n_monitors];
for ( int i = 0; i < n_monitors; i++ ) {
last_capture_times[i].tv_sec = last_capture_times[i].tv_usec = 0;