ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

still corrupting memory

This commit is contained in:
Isaac Connor 2017-12-01 14:48:30 -05:00
parent 2e3fda488e
commit b87e459125
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/zm_monitor.cpp
View File

@ -2745,6 +2745,7 @@ Monitor *Monitor::Load( unsigned int p_id, bool load_zones, Purpose purpose ) {
int Monitor::Capture() { int Monitor::Capture() {
static int FirstCapture = 1; // Used in de-interlacing to indicate whether this is the even or odd image static int FirstCapture = 1; // Used in de-interlacing to indicate whether this is the even or odd image
GetLastEventId();
unsigned int index = image_count % image_buffer_count; unsigned int index = image_count % image_buffer_count;
if ( (index == shared_data->last_read_index) && (function > MONITOR) ) { if ( (index == shared_data->last_read_index) && (function > MONITOR) ) {

2
src/zm_videostore.cpp
View File

@ -46,7 +46,7 @@ VideoStore::VideoStore(
packets_written = 0; packets_written = 0;
frame_count = 0; frame_count = 0;
av_register_all(); FFMPEGInit();
Info("Opening video storage stream %s format: %s", filename, format); Info("Opening video storage stream %s format: %s", filename, format);