Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-13 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
77bbc7ae4d6ef07f9bb0460c0067f0b70ab6e9c1
ZLMediaKit/server
History
xiongziliang 77bbc7ae4d Merge remote-tracking branch 'FreeNVR/freenvr' 
# Conflicts:
#	server/FFmpegSource.cpp
#	server/Process.cpp
#	server/Process.h
#	server/System.cpp
2020-01-07 15:08:15 +08:00
..
CMakeLists.txt
windows视频FFmpeg拉流代理
2020-01-07 14:37:18 +08:00
FFmpegSource.cpp
Merge remote-tracking branch 'FreeNVR/freenvr'
2020-01-07 15:08:15 +08:00
FFmpegSource.h
优化FFmpeg拉流失败重试机制
2019-12-29 17:14:23 +08:00
main.cpp
支持rtp代理服务器
2019-12-06 11:54:10 +08:00
Process.cpp
Merge remote-tracking branch 'FreeNVR/freenvr'
2020-01-07 15:08:15 +08:00
Process.h
Merge remote-tracking branch 'FreeNVR/freenvr'
2020-01-07 15:08:15 +08:00
System.cpp
Merge remote-tracking branch 'FreeNVR/freenvr'
2020-01-07 15:08:15 +08:00
System.h
windows视频FFmpeg拉流代理
2020-01-07 14:37:18 +08:00
WebApi.cpp
windows视频FFmpeg拉流代理
2020-01-07 14:37:18 +08:00
WebApi.h
修复setServerConfig接口保存配置文件相关bug
2019-11-04 09:21:11 +08:00
WebHook.cpp
优化代码
2019-12-29 15:43:51 +08:00
WebHook.h
统一添加bom
2019-08-08 19:01:45 +08:00