mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-03-20 06:48:00 -04:00
fix merges
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user