amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-05 10:37:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,664 Commits 16 Branches 0 Tags 224 MiB
426d76f05c
Commit Graph

3664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiongziliang
0c79af024c 切换submodule至gitee 2019-11-29 11:32:17 +08:00
xiongziliang
5e9291e035 添加启动失败处理逻辑 2019-11-29 11:27:54 +08:00
xiongziliang
22c01d0a03 完善范例配置文件 2019-11-29 10:14:08 +08:00
xiongziliang
d587ddf7ef 添加服务器启动报告 2019-11-29 10:12:20 +08:00
xiongziliang
544135b2d7 Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit 2019-11-29 09:57:11 +08:00
xiongziliang
c42ee1dc5d 优化时间戳覆盖逻辑:#148 2019-11-29 09:54:48 +08:00
夏楚
e84af6a9e2
Update ccpp.yml 2019-11-26 09:52:20 +08:00
xiongziliang
bf70a01f6a 提升rtsp的兼容性 2019-11-25 17:59:04 +08:00
xiongziliang
21cf3bcee0 播放器track未初始化成功时间改成最大为5秒 2019-11-21 18:07:40 +08:00
xiongziliang
ab97486200 完善判断逻辑 2019-11-21 16:34:18 +08:00
xiongziliang
54f2c0b53c 兼容一些奇怪sdp的rtsp url 2019-11-21 16:31:50 +08:00
xiongziliang
e7bd5a4174 兼容一些奇怪的sdp 2019-11-21 15:11:43 +08:00
xiongziliang
083933cbad 修复访问野指针的问题：#146 2019-11-21 13:46:42 +08:00
xiongziliang
e6d511cc9e 解决播放成功与中途断开事件触发紊乱的问题:#143 2019-11-19 15:52:02 +08:00
xiongziliang
85cd4a7d02 修复遍历删除可能崩溃的bug 2019-11-19 10:55:44 +08:00
xiongziliang
2eb64d2c39 确保rtp端口为偶数，rtcp端口为奇数 2019-11-19 10:20:57 +08:00
xiongziliang
517f3c229c 添加kick_sessions接口 2019-11-18 16:34:39 +08:00
xiongziliang
bcc5c839a5 close_stream接口结果返回字段改成result 2019-11-18 16:28:56 +08:00
xiongziliang
f628985037 优化代码 2019-11-18 16:16:56 +08:00
xiongziliang
0d42aab9e7 修复FFmpeg拉流代理无法通过close_stream接口关闭的bug 2019-11-18 12:07:11 +08:00
xiongziliang
ddf351d350 添加close_streams接口 2019-11-18 10:46:59 +08:00
xiongziliang
a993132a59 修复FFmpeg拉流代理卡顿的问题 2019-11-15 13:50:42 +08:00
夏楚
08ad39d005
Update ccpp.yml 2019-11-14 15:26:35 +08:00
夏楚
2543ee01dc
Update ccpp.yml 2019-11-14 15:22:15 +08:00
xiongziliang
a3e67a1306 完成workflows测试 2019-11-14 15:14:25 +08:00
xiongziliang
c8ba6fd73f 更新ZLToolKit 2019-11-14 14:48:27 +08:00
夏楚
c1f3b8ffbc
Create ccpp.yml 2019-11-14 14:45:12 +08:00
xiongziliang
d440c424c4 获取线程负载接口返回code字段 
简化代码
 2019-11-13 14:33:19 +08:00
xiongziliang
aef8fb8849 添加isMediaOnline接口判断是否媒体在线 2019-11-13 14:26:12 +08:00
xiongziliang
9665d557ae 兼容拼写错误 2019-11-13 14:11:49 +08:00
xiongziliang
0522ad2677 Merge remote-tracking branch 'origin/master' 2019-11-13 14:05:33 +08:00
xiongziliang
88a5de00b2 修正拼写错误 2019-11-13 14:05:15 +08:00
夏楚
94eebdadf1
Update README_CN.md 2019-11-13 10:45:52 +08:00
夏楚
d1fd674c36
Update README.md 2019-11-13 10:43:46 +08:00
xiongziliang
3554fe920f 更新ZLToolKit 2019-11-12 10:00:55 +08:00
xiongziliang
8c0596bfb2 更新ZLToolKit(修复发送缓存覆盖导致ssl错误的bug) 2019-11-12 09:52:34 +08:00
xiongziliang
1b6e61c413 1、修复#125 
2、修复非法rtsp url导致异常的问题
 2019-11-11 19:03:03 +08:00
xiongziliang
36a3f4225c Merge remote-tracking branch 'origin/master' 2019-11-11 16:22:31 +08:00
xiongziliang
d6b319b993 尝试修复 #125 2019-11-11 16:22:12 +08:00
夏楚
c2e3dfbbe9
Merge pull request #124 from gemfield/master 
Add Docker support
 2019-11-08 16:54:23 +08:00
Gemfield
814e94b6b0 Add Docker support 2019-11-08 16:50:23 +08:00
xiongziliang
5a1503008f 完善注释 2019-11-08 15:55:26 +08:00
xiongziliang
a8a4f267f7 添加配置项，控制在关闭hook时，推流是否转协议或录制 2019-11-08 15:54:13 +08:00
xiongziliang
9b7d62347e 完善 2019-11-08 15:26:46 +08:00
xiongziliang
9d7b2821b7 初步支持ssl多证书 2019-11-08 15:20:54 +08:00
xiongziliang
ccbd1d4a83 添加hls.segRetain配置项，修复hls切片等于segNum+1的问题 2019-11-05 10:27:28 +08:00
xiongziliang
35c4c05e7b 修复setServerConfig接口保存配置文件相关bug 2019-11-04 09:21:11 +08:00
xiongziliang
a30a83d665 添加H265相关接口 2019-11-01 15:40:21 +08:00
baiyfcu
5d1df021fe
Merge pull request #9 from xiongziliang/master 
update
 2019-10-30 13:20:09 +08:00
xiongziliang
0bff2ad176 优化精简Http服务器代码 2019-10-29 09:16:52 +08:00