mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-18 11:35:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into h265

Browse Source
This commit is contained in:
Isaac Connor
2018-10-22 10:30:01 -04:00
parent 0ec391354c 530a53f138
commit a8329465fb
108 changed files with 3090 additions and 935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/zm_monitor.cpp
View File

@@ -412,7 +412,7 @@ Monitor::Monitor(
+ (image_buffer_count*camera->ImageSize())
+ 64; /* Padding used to permit aligning the images buffer to 64 byte boundary */
Debug(1, "mem.size SharedData=%d TriggerData=%d VideoStoreData=%d total=%d",
Debug(1, "mem.size SharedData=%d TriggerData=%d VideoStoreData=%d total=%" PRId64,
sizeof(SharedData), sizeof(TriggerData), sizeof(VideoStoreData), mem_size);
mem_ptr = NULL;
@@ -2387,7 +2387,6 @@ int Monitor::Capture() {
Info("Return from Capture (%d), signal loss", captureResult);
// Tell zma to end the event. zma will reset TRIGGER
trigger_data->trigger_state = TRIGGER_OFF;
// Unable to capture image for temporary reason
// Fake a signal loss image
Rgb signalcolor;