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

Merge branch 'sort_packets' into storageareas

This commit is contained in:
Isaac Connor 2019-05-03 14:58:34 -04:00
parent 21999cf943 c91da4a7f5
commit 4ecf41f2b4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_packetqueue.cpp
View File

@ -94,9 +94,11 @@ bool zm_packetqueue::queuePacket(ZMPacket* zm_packet) {
packet_counts[zm_packet->packet.stream_index] += 1; packet_counts[zm_packet->packet.stream_index] += 1;
return true; return true;
} }
Warning("Unable to insert packet for stream %d with dts %" PRId64 " into queue.", Debug(1,"Unable to insert packet for stream %d with dts %" PRId64 " into queue.",
zm_packet->packet.stream_index, zm_packet->packet.dts); zm_packet->packet.stream_index, zm_packet->packet.dts);
return false; pktQueue.push_back(zm_packet);
packet_counts[zm_packet->packet.stream_index] += 1;
return true;
} // end bool zm_packetqueue::queuePacket(ZMPacket* zm_packet) } // end bool zm_packetqueue::queuePacket(ZMPacket* zm_packet)
bool zm_packetqueue::queuePacket(AVPacket* av_packet) { bool zm_packetqueue::queuePacket(AVPacket* av_packet) {