Commit Graph

3095 Commits

Author SHA1 Message Date
ziyue
0c4410c523 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-01-17 10:36:00 +08:00
ziyue
27482a5459 修复编译警告 2022-01-17 10:35:29 +08:00
xiongziliang
c9d755f4e8 修复编译问题 2022-01-14 22:04:46 +08:00
wangcker
e8b0993493
给openrtpserver接口添加enable_reuse参数 (#1372)
* 修改rtpopen逻辑

* 给openrtpserver接口添加enable_reuse端口
2022-01-14 21:53:01 +08:00
JayChen0519
a3e628449e
解决rtsp以MULTICAST方式拉流导致的奔溃问题 (#1368) 2022-01-14 13:14:30 +08:00
ziyue
30db79f4dd Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-01-14 13:10:27 +08:00
ziyue
556161c20f 更新三方库 2022-01-14 13:09:57 +08:00
ziyue
75465311d9 修复丢包导致aac确实导致内存越界的bug: #1363 2022-01-14 13:09:47 +08:00
alexliyu7352
d4d7a72dcb
邮件地址markdown不识别 (#1362)
github好像没办法渲染(<邮件地址>)
改成mailto:直接使用html
2022-01-13 20:11:58 +08:00
夏楚
9284dc00be
Update README.md 2022-01-13 18:10:20 +08:00
ziyue
b7b47db91e 更新文档描述 2022-01-13 16:23:15 +08:00
ziyue
402214c3d4 添加断连续推功能描述 2022-01-13 16:08:33 +08:00
ziyue
a0dec8cd79 支持多级溯源 2022-01-12 20:24:19 +08:00
ziyue
f0cd54fe83 更新溯源功能相关描述 2022-01-12 19:54:22 +08:00
ziyue
170f5500cf 新增溯源超时时间配置项 2022-01-12 17:58:07 +08:00
ziyue
6f4d8c5884 Typo: 修复错误注释 2022-01-12 17:51:00 +08:00
ziyue
838e4f2788 溯源集群模式支持多个源站 2022-01-12 17:43:07 +08:00
ziyue
be77f84315 支持溯源方式的集群模式 2022-01-12 16:48:14 +08:00
ziyue
d52fc4c31f Refine: 优化rtsp相关代码 2022-01-12 15:24:28 +08:00
ziyue
5b6ff0af27 完善mingw编译环境的适配 2022-01-11 14:09:57 +08:00
ziyue
fdcc29e0ed 修复http客户端复用header无法更新的bug: #1349 2022-01-11 10:44:49 +08:00
xiongziliang
60f11df1ea Revert "修复302跳转时, 如果跨域,header不正确的问题 (#1349)"
This reverts commit 741b197f
2022-01-11 09:18:36 +08:00
ziyue
6636482bcf 修复c api日志打印bug 2022-01-10 19:57:26 +08:00
ziyue
09ac333e35 webrtc支持断连续推 2022-01-10 17:43:28 +08:00
ziyue
412d280cd7 修复断连续推转协议失效的bug 2022-01-10 17:34:39 +08:00
ziyue
1dabc22347 修正错误注释 2022-01-10 17:00:25 +08:00
ziyue
f5efd232a9 rtsp/rtmp推流支持断连续推: #1240, #1300 2022-01-10 16:43:57 +08:00
xiongziliang
262af8dfeb 修复编译问题 2022-01-09 15:12:23 +08:00
xiongziliang
7b04385bc8 合并http-ts播放器特性: #1336 2022-01-09 15:01:23 +08:00
xiongziliang
a4c69e61cd Merge branch 'patch2' of github.com:alexliyu7352/ZLMediaKit 2022-01-09 14:54:21 +08:00
alexliyu7352
26d458d067
增加ffmpeg拉流自动重启时间, 避免长时间拉流导致的声音不同步现象 (#1346) 2022-01-09 14:51:54 +08:00
Dw9
819599ac25
修复获取帧率逻辑 (#1293) 2022-01-09 14:50:54 +08:00
alexliyu7352
741b197f31
修复302跳转时, 如果跨域,header不正确的问题 (#1349) 2022-01-09 14:32:59 +08:00
xiongziliang
f4d8eb4515 Rtmp: 获取h264sps/aac config失败时打印rtmp包内容 2022-01-08 16:28:13 +08:00
xiongziliang
692febcadd Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-01-08 16:07:45 +08:00
xiongziliang
6e445614b4 申请udp端口使用全局互斥锁保护,防止端口重复分配 2022-01-08 16:07:08 +08:00
xgj
c22644af12 更新zlmrtcclient.js 播放客户端,增加状态改变通知 2022-01-08 15:37:20 +08:00
ziyue
afc7b019f1 完善日志去重逻辑 2022-01-07 11:00:58 +08:00
ziyue
1d81a77171 修复windows下编译错误 2022-01-06 16:05:17 +08:00
ziyue
fd6e4b6342 MPEG: 优化http-ts性能: #1342 2022-01-06 15:30:09 +08:00
ziyue
5a592e6db6 优化循环池性能 2022-01-06 14:30:44 +08:00
ziyue
e2636c5179 更新zltoolkit 2022-01-06 12:43:58 +08:00
ziyue
e43c838c2a Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-01-06 12:35:23 +08:00
ziyue
328dc77a78 Merge remote-tracking branch 'origin/master' 2022-01-06 12:34:32 +08:00
ziyue
974626024d 更新并适配zltoolkit, 过滤重复日志 2022-01-06 12:34:21 +08:00
alexliyu7352
3a0857ea31
当url并不是m3u8文件时, 避免拉取hls流出错 (#1341) 2022-01-05 20:01:19 +08:00
monktan
2fbb40135c 修改docker镜像为国内源,加快镜像构建速度 2022-01-04 21:13:55 +08:00
ziyue
ed4291bf3d Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-01-04 16:54:51 +08:00
ziyue
3ccd48e7a9 HLS: 返回全部切片数据后,链接断开不报错: #1332 2022-01-04 16:53:19 +08:00
alexliyu7352
6f9f93cb97
忘记删除很早很早以前注释掉的代码了 2022-01-04 15:46:48 +08:00