Merge branch 'fix_zms_from_mp4' into h265

This commit is contained in:
Isaac Connor committed 2018-09-13 16:18:28 -04:00
commit 0ec391354c
18 files changed
+224 -153

No files matched your search

+3
View File
@@ -119,11 +119,14 @@ unsigned int zm_packetqueue::clearQueue( unsigned int frames_to_keep, int stream
void zm_packetqueue::clearQueue() {
ZMPacket *packet = NULL;
int delete_count = 0;
while(!pktQueue.empty()) {
packet = pktQueue.front();
pktQueue.pop_front();
delete packet;
delete_count += 1;
}
Debug(3, "Deleted (%d) packets", delete_count );
}
unsigned int zm_packetqueue::size() {