2195 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongziliang	65f072a82b	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit	2021-04-11 11:40:22 +08:00
xiongziliang	271b180004	修复流注册事件track和regist字段缺失的bug	2021-04-11 11:39:49 +08:00
夏楚	9b57edff09	webrtc supported	2021-04-09 20:10:57 +08:00
夏楚	e899064b2a	添加webrtc相关描述	2021-04-09 19:58:40 +08:00
夏楚	67eb75048c	Update README.md	2021-04-08 18:11:21 +08:00
xia-chu	67e1b1f194	媒体注册hook添加编码等信息	2021-04-08 17:34:46 +08:00
xiongziliang	a328520c9c	buf fixed	2021-04-01 22:24:35 +08:00
xiongziliang	2434470fb8	G711强制规格	2021-04-01 22:20:29 +08:00
xiongziliang	d2fec801c9	兼容不规范的rtmp推流器：#764	2021-04-01 22:03:21 +08:00
xiongziliang	075756c4c6	提升兼容性：#789	2021-04-01 21:46:02 +08:00
xiongziliang	5539050f06	更新第三方库	2021-04-01 21:44:10 +08:00
xiongziliang	f217467699	Merge remote-tracking branch 'origin/master'	2021-04-01 20:14:44 +08:00
xiongziliang	9a26ba9f8a	修复android下编译问题	2021-04-01 20:14:07 +08:00
ziyue	2f0bdf2724	修复32位编译时，websocket相关bug	2021-03-21 18:22:32 +08:00
xiongziliang	f2edf354de	rtmp支持更新config帧	2021-03-21 16:50:15 +08:00
ziyue	c5b0485519	修复sps太长生成sdp异常的问题	2021-03-18 16:10:46 +08:00
ziyue	51ac93a08c	rtp超时检测最多暂停5分钟 ... 更新zltoolkit	2021-03-16 15:37:34 +08:00
ziyue	060b654252	修改rtp超时检测相关http api,rtp超时检测最多暂停5分钟	2021-03-16 11:31:41 +08:00
ziyue	d475191dc7	修复过早启动时间戳线程的bug	2021-03-16 10:52:43 +08:00
ziyue	28e6dd9e02	修复过早启动时间戳线程的bug	2021-03-16 10:50:08 +08:00
xiongziliang	a0fc494ee3	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit	2021-03-14 10:34:33 +08:00
xiongziliang	be8403c31c	完善代码	2021-03-14 10:29:17 +08:00
夏楚	29ebcaf3e9	Merge pull request #767 from sunhui2013/master ... 增加支持tcp收流暂停/恢复流检测功能	2021-03-14 10:05:22 +08:00
sunhui	ce80edffd2	增加支持TCP暂停	2021-03-11 10:05:53 +08:00
sunhui	f5e8bae760	解决不指定流或者TCP暂停断流问题	2021-03-10 23:17:15 +08:00
xiongziliang	c0f4899950	录制接口支持指定切片时间大小:#747	2021-03-07 10:41:57 +08:00
xiongziliang	daedbed737	更新第三方库	2021-03-07 10:16:39 +08:00
xiongziliang	378ab47250	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit	2021-03-07 10:08:28 +08:00
xiongziliang	5064137a22	简化代码	2021-03-07 10:05:52 +08:00
xiongziliang	5b4fe604cb	修复编译警告	2021-03-07 10:05:23 +08:00
xiongziliang	bd9769d215	兼容rtmps rtsps的推流地址	2021-03-07 10:04:58 +08:00
xiongziliang	43828d4390	兼容某些rtmp流	2021-03-07 10:04:27 +08:00
夏楚	43f2245587	Merge pull request #758 from rmokerone/master ... 使用URL替换相对路径，避免其余项目的fork	2021-03-07 10:03:24 +08:00
vroot	e91f2e60c7	修改submodules源为gitee	2021-03-07 09:45:58 +08:00
vroot	e6f28f7cd7	使用URL替换相对路径，避免其余项目的fork	2021-03-05 18:24:09 +08:00
xia-chu	9b7c9b9109	兼容sdp不规范的rtsp流	2021-02-28 21:02:23 +08:00
xiongziliang	6548f7959f	更新第三方库	2021-02-28 21:02:55 +08:00
xiongziliang	fb3603b433	兼容一些不规范的流	2021-02-28 20:58:30 +08:00
xiongziliang	56f044f8ed	修复线程安全bug	2021-02-28 20:58:25 +08:00
xia-chu	8d50d3c397	分包逻辑添加边界检测代码	2021-02-21 22:24:46 +08:00
xia-chu	ef46945de6	恢复使用jemalloc库	2021-02-21 22:02:25 +08:00
xia-chu	0c728827aa	添加全局内存统计功能	2021-02-21 21:28:17 +08:00
xia-chu	a19f67679a	兼容一些rtsp流 #735	2021-02-21 21:27:26 +08:00
xia-chu	19f3b1bd6f	防止打印过多调试信息	2021-02-21 21:26:45 +08:00
xia-chu	8d122625c5	修复28181相关bug：#731	2021-02-09 14:19:07 +08:00
xia-chu	b7f4eae2bc	修复bug	2021-02-09 14:01:10 +08:00
xia-chu	e4904623a7	修复rtmp兼容性bug	2021-02-07 23:01:22 +08:00
xia-chu	1f52c727ca	修复编译警告	2021-02-07 22:56:36 +08:00
xia-chu	a142665375	确保线程安全	2021-02-07 22:02:03 +08:00
xia-chu	75d97b9221	优化H264 rtp相关代码	2021-02-07 18:29:48 +08:00