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 |
|
xiongziliang
|
ba71bac475
|
提升sdp解析兼容性
|
2019-10-08 09:55:59 +08:00 |
|
xiongziliang
|
b1c8b24d18
|
提升sdp兼容性
|
2019-10-08 09:45:43 +08:00 |
|
xiongziliang
|
e5cb5c56a1
|
提升sdp解析兼容性
|
2019-10-08 09:44:08 +08:00 |
|
xiongziliang
|
eb12bc7397
|
提升sdp解析兼容性
|
2019-10-08 09:39:54 +08:00 |
|
xiongziliang
|
205b01f6d1
|
修复http文件服务器可能丢失数据的问题
|
2019-09-30 20:07:09 +08:00 |
|
xiongziliang
|
b573b5bbac
|
防止时间戳跳变
|
2019-09-30 16:51:17 +08:00 |
|
xiongziliang
|
119d8d824f
|
完善配置文件说明
|
2019-09-30 09:20:14 +08:00 |
|
xiongziliang
|
c6270aa1f9
|
Merge pull request #99
|
2019-09-30 09:13:19 +08:00 |
|
Weiwei.Zhou
|
39a528cc02
|
停止写之后将最后的片段也写进m3u8文件中
|
2019-09-29 22:05:18 +08:00 |
|
nanguantong
|
5704d8171c
|
Merge pull request #1 from zlmediakit/master
merge
|
2019-09-29 22:00:18 +08:00 |
|
xiongziliang
|
e69ec8f8a2
|
更新ZLToolKit(windows下日志支持颜色)
|
2019-09-29 15:30:10 +08:00 |
|
xiongziliang
|
dd81a70bed
|
添加是否添加静音音频选项
|
2019-09-29 10:33:05 +08:00 |
|
baiyfcu
|
612a9dc541
|
Merge pull request #8 from zlmediakit/master
update
|
2019-09-28 10:26:31 +08:00 |
|
xiongziliang
|
940c3ffbca
|
rtsp/rtmp点播改成后台线程读取
|
2019-09-27 18:05:42 +08:00 |
|
xiongziliang
|
9fc31f3d3e
|
修复android下老版本ndk编译兼容性问题
|
2019-09-27 09:58:42 +08:00 |
|
xiongziliang
|
e3e412cf8e
|
更新ZLToolKit(修复在覆盖时间戳时的相关bug)
|
2019-09-26 19:10:45 +08:00 |
|
xiongziliang
|
4bc355b08a
|
支持hls点播录制
|
2019-09-26 14:21:20 +08:00 |
|
xiongziliang
|
86fcf69f81
|
提高rtsp对H264编码的sdp的兼容性
|
2019-09-25 22:16:35 +08:00 |
|
夏楚
|
df7305c6ce
|
Merge pull request #94 from nanguantong/master
添加文件循环读取
|
2019-09-25 09:11:58 +08:00 |
|
Weiwei.Zhou
|
67575bb2e1
|
添加文件循环读取
|
2019-09-24 20:48:30 +08:00 |
|