648540858 2ff3cdb6a1 Merge branch 'wvp-28181-2.0' ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java		2022-09-26 11:25:53 +08:00
..
dto	Merge branch 'wvp-28181-2.0'	2022-09-24 21:04:58 +08:00
event	优化点播时RtpServer为正常关闭的问题	2022-09-16 18:02:56 +08:00
AssistRESTfulUtils.java	添加对海康平台录像回放的兼容，修复录像信息发送失败, 级联平台支持开启rtcp保活	2022-09-05 17:10:21 +08:00
ZLMHttpHookListener.java	dialog去除以及异常情况处理优化	2022-09-23 23:15:39 +08:00
ZlmHttpHookSubscribe.java	优化sip消息，去除自动dialog创建	2022-09-21 18:18:37 +08:00
ZLMMediaListManager.java	dialog去除以及异常情况处理优化	2022-09-23 23:15:39 +08:00
ZLMRESTfulUtils.java	Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial	2022-06-27 10:16:21 +08:00
ZLMRTPServerFactory.java	Merge branch 'wvp-28181-2.0'	2022-09-24 21:04:58 +08:00
ZLMRunner.java	优化点播时RtpServer为正常关闭的问题	2022-09-16 18:02:56 +08:00
ZLMServerConfig.java	使用zlm原生的rtp随机端口配置	2022-03-15 15:37:22 +08:00