3769 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
joshuafc	c97aa8483e	当调用mk_media_source_close(ptr, 1);时，主动注销流 (#1401) ... * 当调用mk_media_source_close(ptr, 1);时，主动注销流 主动调用上述函数时，期望不再等待RtmpSession.cpp:49处getPoller()->doDelayTask(continue_push_ms, [push_src]() { return 0; });捕获的指针，等待析构时反注册，而是立即反注册。 * `MediaSource::close`逻辑执行成功后执行`unregist`	2022-01-27 14:56:18 +08:00
Xiaofeng Wang	4b2be8e05a	调整 clang-format 风格配置 (#1404)	2022-01-27 14:39:55 +08:00
xiongziliang	3bf6ec8939	修复获取推流所有权导致引用计数紊乱的bug: #1397	2022-01-26 00:37:51 +08:00
ziyue	756ec1364b	websocket客户端触发事件时确保对象强引用有效 ... 同时修复websocket客户端判断alive返回false的bug	2022-01-25 11:44:51 +08:00
ziyue	4f27894302	添加bom头	2022-01-24 14:25:37 +08:00
ziyue	bc583e80b5	合并pr: #1391	2022-01-24 14:23:36 +08:00
ziyue	96061f1d36	Merge branch 'fix_rtc_g711_play' of github.com:ZLMediaKit/ZLMediaKit	2022-01-24 14:16:19 +08:00
xgj	341459fbf5	fix non rtc push rtc play g711 audio loss	2022-01-24 11:57:24 +08:00
ziyue	0ae9a8c8c8	Revert "添加递归溢出检测代码: #1363" ... This reverts commit 8937d9ea92.	2022-01-24 11:38:36 +08:00
ziyue	80ecd2098e	修复编译警告	2022-01-24 10:48:15 +08:00
ziyue	131476d3ac	更新zltoolkit, 修复RingBuffer相关bug	2022-01-24 10:47:21 +08:00
ziyue	100822f079	HLS: 修复时间戳回退导致不生成ts切片的bug: #1381, #1386	2022-01-21 18:00:44 +08:00
ziyue	3a8e954255	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2022-01-21 16:11:22 +08:00
ziyue	5007578202	hls/ts 播放器不做content-length严格限制	2022-01-21 16:10:27 +08:00
xiongziliang	f46d909bba	添加bom头，解决msvc编译问题	2022-01-20 22:49:47 +08:00
ziyue	bf191aa902	去除多余头文件	2022-01-20 15:42:53 +08:00
ziyue	88dc8d0a73	重写http客户端异常处理机制	2022-01-20 15:17:19 +08:00
ziyue	0f905b7333	优化http-ts播放器日志提示	2022-01-19 22:53:21 +08:00
ziyue	ee6ad66a6d	HTTP: 重写http相关超时管理机制	2022-01-19 22:50:44 +08:00
ziyue	03a8d3a6ac	Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit	2022-01-19 17:45:15 +08:00
ziyue	81cf93a2bf	openRtpServer接口强制关闭reuse_port属性，防止端口冲突	2022-01-19 17:44:58 +08:00
夏楚	23774cc3b3	Update README.md	2022-01-19 17:17:22 +08:00
夏楚	bde80d205f	Update README.md	2022-01-19 17:12:03 +08:00
ziyue	8937d9ea92	添加递归溢出检测代码: #1363	2022-01-17 14:47:55 +08:00
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