2231 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongziliang	f54e02f511	修复http文件服务器相关bug	2021-05-22 09:28:19 +08:00
xiongziliang	8cbec43ee8	合并代码	2021-05-22 09:26:49 +08:00
xiongziliang	a391d1e289	修复rtsp推流带参相关的bug:#840	2021-05-22 09:25:24 +08:00
xiongziliang	259e9dab07	更新ZLToolKit	2021-05-15 09:59:36 +08:00
xiongziliang	125b703ea9	Merge remote-tracking branch 'origin/master'	2021-05-15 09:57:21 +08:00
xiongziliang	e807a08f2e	单track rtsp推流加快媒体注册速度	2021-05-15 09:56:35 +08:00
xia-chu	af59fdeb86	addStreamProxy接口支持超时参数	2021-04-30 18:01:48 +08:00
xia-chu	3da874b6a1	修复错误拼写、加快流注册速度	2021-04-30 11:47:21 +08:00
xia-chu	e8a409b811	更新链接地址	2021-04-30 11:44:40 +08:00
xia-chu	8e9d7a9fd5	作者列表勘误	2021-04-30 11:44:37 +08:00
xia-chu	3cc640f96e	删除无效配置	2021-04-30 11:44:06 +08:00
xia-chu	839420814e	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit	2021-04-28 17:34:41 +08:00
xia-chu	adc3d74344	修复bug	2021-04-28 17:33:47 +08:00
xiongziliang	61afc57ed1	修复编译问题	2021-04-27 23:05:04 +08:00
xia-chu	86afa379c4	更新zltoolkit,修复gcc下编译问题	2021-04-26 19:24:28 +08:00
xia-chu	af2b1246fd	统一帧合并逻辑	2021-04-26 18:35:01 +08:00
xia-chu	d005ccf396	更新zltoolkit	2021-04-26 18:24:34 +08:00
xia-chu	a28c76a33c	限制未就绪状态track的最大帧缓存数量	2021-04-26 14:58:06 +08:00
xiongziliang	259247132a	Merge remote-tracking branch 'origin/master'	2021-04-22 22:13:17 +08:00
xiongziliang	f70bfb5f8b	兼容GB28181 tcp推流缓存覆盖的垃圾设备	2021-04-22 22:02:21 +08:00
xia-chu	0bb87858a3	提升单track情况下秒开体验	2021-04-20 17:53:43 +08:00
xia-chu	9b951ab69a	单track情况下最多等待3秒	2021-04-20 17:32:40 +08:00
xia-chu	ef0371ef94	修复编译警告	2021-04-20 17:32:22 +08:00
xiongziliang	9004ad7a60	修复老版本openssl编译问题	2021-04-19 19:48:30 +08:00
xiongziliang	4a6a3746dd	更新ZLToolKit	2021-04-18 23:11:08 +08:00
xiongziliang	387574a802	rtp主动推流时不触发无人观看事件:#799	2021-04-18 21:34:34 +08:00
xiongziliang	5fd23c4cf7	更新ZLToolKit	2021-04-18 21:03:20 +08:00
xiongziliang	7884338b60	修复rtmp协议amf3不兼容的bug	2021-04-18 21:02:01 +08:00
夏楚	c8e4c916bf	Update issue templates	2021-04-14 14:55:53 +08:00
夏楚	7ad3bc854b	Update issue templates	2021-04-14 14:52:55 +08:00
夏楚	8c0781d4bf	Update issue templates	2021-04-14 14:49:50 +08:00
夏楚	136d126e74	Update RtpReceiver.cpp	2021-04-13 08:28:23 +08:00
夏楚	d619c33b1f	Update issue templates	2021-04-12 13:58:35 +08:00
夏楚	a53c41fbb1	Update bug--.md	2021-04-12 10:26:26 +08:00
夏楚	a9ad0552fd	Update issue templates	2021-04-12 10:25:20 +08:00
xia-chu	8a51bd2d9e	新增rtp ssrc异常处理逻辑	2021-04-11 20:35:00 +08:00
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