xia-chu 46b84fcf39 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev

2021-04-12 13:48:34 +08:00

..

CMakeLists.txt

完善

2021-03-26 18:22:19 +08:00

FFmpegSource.cpp

录制接口支持指定切片时间大小:#747

2021-03-07 10:41:57 +08:00

FFmpegSource.h

ffmpeg拉流支持指定命令模板

2021-01-23 09:42:15 +08:00

main.cpp

开始对接js

2021-03-31 17:15:26 +08:00

Process.cpp

修复android下编译问题

2021-04-01 20:14:07 +08:00

Process.h

全面整理代码，去除编译警告

2021-01-17 18:31:50 +08:00

System.cpp

去除编译警告，修复bug

2021-01-19 16:05:38 +08:00

System.h

全面整理代码，去除编译警告

2021-01-17 18:31:50 +08:00

version.h.ini

合并pr(#661): 减少unsport code打印，新增git信息获取

2021-01-02 22:02:23 +08:00

WebApi.cpp

Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev

2021-04-12 13:48:34 +08:00

WebApi.h

Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev

2021-04-09 10:47:14 +08:00

WebHook.cpp

修复流注册事件track和regist字段缺失的bug

2021-04-11 11:39:49 +08:00

WebHook.h

全面整理代码，去除编译警告

2021-01-17 18:31:50 +08:00