‘sxh’ 652489b47e Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java		2023-06-15 11:10:20 +08:00
..
dto	修复拉流代理的ffmpeg代理方式	2023-06-05 10:28:11 +08:00
event	优化点播时RtpServer为正常关闭的问题	2022-09-16 18:02:56 +08:00
AssistRESTfulUtils.java	优化录像配置。不再使用zlm默认的http服务器	2023-03-25 18:40:29 +08:00
ZLMHttpHookListener.java	新增设备主子码流选择，默认为不开启	2023-06-15 11:00:29 +08:00
ZlmHttpHookSubscribe.java	修复hook订阅移除失败的问题	2023-05-08 17:55:07 +08:00
ZLMMediaListManager.java	修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题	2023-05-06 17:40:57 +08:00
ZLMRESTfulUtils.java	添加获取截图接口	2023-05-29 23:28:06 +08:00
ZLMRTPServerFactory.java	Merge branch '2.6.8' into wvp-28181-2.0	2023-06-07 20:21:10 +08:00
ZLMRunner.java	优化各个配置启动顺序	2023-02-22 18:01:30 +08:00
ZLMServerConfig.java	优化录像配置。不再使用zlm默认的http服务器	2023-03-25 18:40:29 +08:00