amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-24 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,713 Commits 16 Branches 0 Tags 225 MiB
20d3757986
Commit Graph

1713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiongziliang
fd10ef1187 添加下载文件http api范例 2019-10-28 17:23:16 +08:00
xiongziliang
52a663033d Merge remote-tracking branch 'origin/master' 2019-10-28 16:50:40 +08:00
xiongziliang
7ed5b7c2ba http api服务器支持发送大文件 2019-10-28 16:50:15 +08:00
夏楚
e97f517b3a
Update README_CN.md 2019-10-28 13:57:09 +08:00
夏楚
cad870a987
Update README_CN.md 2019-10-28 13:55:48 +08:00
夏楚
f949ca0e7c
Update README.md 2019-10-28 13:55:01 +08:00
xiongziliang
7c16f37d64 优先判断文件然后再判断http-flv 2019-10-27 09:15:29 +08:00
xiongziliang
4ae66f0672 修复mmap相关bug 2019-10-27 03:42:56 +08:00
xiongziliang
4d1d6b1467 暂时禁用mmap 2019-10-27 03:00:19 +08:00
xiongziliang
6023885e93 抽象整理HttpBody类，fread模式下使用循环池提升内存性能 2019-10-27 02:04:51 +08:00
xiongziliang
144fb20339 http服务器支持mmap,提示性能 2019-10-26 18:41:42 +08:00
xiongziliang
2bc918cd2e 去除gfs依赖 2019-10-25 10:46:59 +08:00
xiongziliang
6a8a486171 重新git常规方式添加 2019-10-25 10:46:38 +08:00
xiongziliang
5cae433158 去除git lfs文件 2019-10-25 10:43:55 +08:00
xiongziliang
8e48ab3463 解决defunct进程的问题 2019-10-24 11:42:39 +08:00
xiongziliang
1f89a86892 新增getWorkThreadsLoad接口 2019-10-24 11:21:55 +08:00
xiongziliang
a739bd7304 完善日志 2019-10-23 12:00:53 +08:00
xiongziliang
7e1e735203 更新ZLToolKit 2019-10-21 09:03:11 +08:00
xiongziliang
a4dab8767f 支持相对路径 2019-10-18 10:06:18 +08:00
xiongziliang
0aa28b2848 简化代码 2019-10-18 10:02:42 +08:00
xiongziliang
0f5582689b 防止越权访问 2019-10-18 09:58:22 +08:00
xiongziliang
67d2beb52a 配置文件支持相对路径，http文件服务器防止访问根目录父目录 2019-10-18 09:51:20 +08:00
xiongziliang
cbb25eadef Merge remote-tracking branch 'origin/master' 2019-10-16 11:10:40 +08:00
xiongziliang
3bad329f09 修复resetTracks情况下 MP4录制可能出现的bug 2019-10-16 11:10:20 +08:00
夏楚
82098a284c
Update .gitattributes 2019-10-16 10:40:19 +08:00
夏楚
065b2cf678
Update FUNDING.yml 2019-10-15 18:49:35 +08:00
夏楚
f816ea1727
Create FUNDING.yml 2019-10-15 18:23:14 +08:00
xiongziliang
68d29ba025 rtsp忽略无效的aac track 2019-10-14 16:52:15 +08:00
xiongziliang
a68368a7f3 修复#109 2019-10-14 10:15:46 +08:00
xiongziliang
08386b958c 覆盖时间戳需要明确参数指定，防止误判 2019-10-12 22:44:16 +08:00
xiongziliang
4642bbeb4c rtsp推流默认不覆盖时间戳 2019-10-12 22:02:50 +08:00
xiongziliang
adb808bbb4 完善配置文件注释 2019-10-12 18:35:26 +08:00
xiongziliang
d2406d239d 兼容一些奇怪的rtsp url 2019-10-12 11:22:17 +08:00
xiongziliang
c4aaaa11c7 优化hls生成 2019-10-12 10:29:40 +08:00
xiongziliang
7f203ce9b7 修复回复hls生成的bug 2019-10-11 19:01:34 +08:00
xiongziliang
f1ed019437 合并#106 2019-10-11 17:51:46 +08:00
Weiwei.Zhou
d6e60e0919 添加断流重连是否接着前一次继续写;修复断流重连成功后hls时间戳错误问题 2019-10-11 16:51:10 +08:00
Weiwei.Zhou
7d76a3eb9b 修复hls首个切片延迟生成的问题 2019-10-11 16:16:14 +08:00
xiongziliang
a604d8c620 mp4点播每次流化时间改成500毫秒，优化文件io性能 2019-10-10 17:52:19 +08:00
xiongziliang
732e00ea63 release版本添加jemalloc库 2019-10-10 17:28:38 +08:00
xiongziliang
a09016303b 更新ZLToolKit 2019-10-10 14:35:17 +08:00
Weiwei.Zhou
f0deafd722 mp4录制完成后是否进行二次关键帧索引写入头部 2019-10-10 13:37:56 +08:00
Weiwei.Zhou
7608aa6fa9 merge 2019-10-10 13:22:51 +08:00
nanguantong
def2d71d30
Merge pull request #2 from zlmediakit/master 
pull
 2019-10-10 12:34:11 +08:00
xiongziliang
b3c53391f4 支持低版本Android 2019-10-09 22:18:49 +08:00
xiongziliang
67b70ec8bb android支持更低版本，默认关闭vhost 2019-10-09 22:14:41 +08:00
xiongziliang
54b2cd0089 更新ZLToolKit 2019-10-08 17:22:27 +08:00
xiongziliang
ec925a64e4 防止时间戳回滚 2019-10-08 12:55:19 +08:00
xiongziliang
5efea2d0cc 添加title 2019-10-08 10:22:59 +08:00
xiongziliang
201e06dc0b fixed #102 2019-10-08 10:19:52 +08:00