Commit Graph

14 Commits

Author SHA1 Message Date
xiongziliang
7019e4717c 整理授权协议 2020-04-04 20:30:09 +08:00
xiongziliang
1168174c2b tab统一替换为4个空格键:#242 2020-03-20 11:51:24 +08:00
liuziloong
d2d84680c0 temp 2020-01-19 14:54:31 +08:00
xiongziliang
16751ddf04 windows支持FFmpeg拉流代理 2020-01-07 15:10:59 +08:00
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
xiongziliang
9c42c5ed8c windows视频FFmpeg拉流代理 2020-01-07 14:37:18 +08:00
Luke
306e202ca1 1.添加windows下ffmpeg拉流分发支持,目前不是很完善,后续再修改
2.server/system下未兼容完成
2020-01-07 11:09:11 +08:00
xiongziliang
8e48ab3463 解决defunct进程的问题 2019-10-24 11:42:39 +08:00
xiongziliang
9fc31f3d3e 修复android下老版本ndk编译兼容性问题 2019-09-27 09:58:42 +08:00
xiongziliang
7c7b9e560e 统一添加bom 2019-08-08 19:01:45 +08:00
xiongziliang
9a5d3da69c 修复linux编译失败的问题 2019-06-24 14:57:12 +08:00
xiongziliang
276aa1a497 FFmpeg禁止生产core文件 2019-06-24 14:50:50 +08:00
xiongziliang
4bd6b24c30 添加协议头 2019-06-11 09:25:54 +08:00
xiongziliang
2f6773f180 添加完整的服务器用例 2019-05-20 11:22:59 +08:00