4194 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xia-chu	ef0371ef94	修复编译警告	2021-04-20 17:32:22 +08:00
xia-chu	007c04d958	编译警告修复	2021-04-20 17:17:56 +08:00
xia-chu	cce9de74d3	完善rtcp nack相关代码	2021-04-20 17:15:01 +08:00
xia-chu	31b6dde715	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-04-20 14:30:34 +08:00
xiongziliang	9004ad7a60	修复老版本openssl编译问题	2021-04-19 19:48:30 +08:00
xiongziliang	f69a23565d	Merge remote-tracking branch 'github/master' into dev	2021-04-18 23:13:47 +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	980867965c	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-04-18 21:04:10 +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
xiongziliang	77da999394	更新第三方库	2021-04-15 21:45:00 +08:00
xia-chu	880b9139b0	性能优化	2021-04-15 19:46:45 +08:00
xia-chu	d76c38ef72	调整264 rtp打包逻辑	2021-04-15 19:40:17 +08:00
xia-chu	9d385b36fd	优化多slice情况下关键帧判断逻辑	2021-04-15 19:40:17 +08:00
xia-chu	e00fe51b26	关闭测试代码	2021-04-15 19:40:17 +08:00
xia-chu	cc5dee0abf	优化sdp fmtp字段处理逻辑	2021-04-15 19:40:17 +08:00
xia-chu	46e3538dca	Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev	2021-04-15 16:22:21 +08:00
xgj	3150ccdb70	add some comment	2021-04-15 14:08:25 +08:00
Your Name	bffee09639	fix more slice nal one frame result rtp mark error and sps pps rtp not has a mark	2021-04-15 13:54:03 +08:00
xgj	6e4dfaf53f	fix webrtc h264 rtp Packetizer error	2021-04-15 00:15:41 +08:00
xia-chu	7ce965af48	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev	2021-04-14 18:39:53 +08:00
xia-chu	765db1eb8b	添加rtcp fci相关代码	2021-04-14 18:39:21 +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
xia-chu	a4ba0c2b60	Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-04-14 09:26:11 +08:00
xia-chu	c4fd9e294a	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-04-14 09:25:56 +08:00
xiongziliang	37096f8ed0	完善rtcp的定义	2021-04-13 22:27:57 +08:00
xia-chu	29c8c9bf26	Merge remote-tracking branch 'origin/dev' into dev	2021-04-13 18:51:16 +08:00
xia-chu	f939e0a894	添加一些rtcp fci相关定义	2021-04-13 18:50:20 +08:00
夏楚	136d126e74	Update RtpReceiver.cpp	2021-04-13 08:28:23 +08:00
xia-chu	69148d28de	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev	2021-04-12 15:41:05 +08:00
夏楚	d619c33b1f	Update issue templates	2021-04-12 13:58:35 +08:00
xia-chu	46b84fcf39	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-04-12 13:48:34 +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	753fe05813	采用pts	2021-04-11 12:07:04 +08:00
xiongziliang	fbe8beb364	添加rtc相关配置与描述	2021-04-11 12:06:55 +08:00
xiongziliang	8b7289a689	rtsp推流支持关闭直接代理模式	2021-04-11 12:06:40 +08:00
xiongziliang	9e93561c77	只有linux平台打开链接顺序无关选项	2021-04-11 11:53:05 +08:00
xiongziliang	5fadd2665d	非windows平台，才忽略静态库链接顺序	2021-04-11 11:44:16 +08:00
xiongziliang	bbe67e928e	Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev	2021-04-11 11:42:45 +08:00
xiongziliang	e094a0bcae	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev	2021-04-11 11:41:27 +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
xgj	1739980989	Merge remote-tracking branch 'china/dev' into dev	2021-04-11 09:15:22 +08:00
xiongziliang	012f58d27c	添加rtp 调试接口	2021-04-11 01:15:02 +08:00
xiongziliang	33da2e28ec	修复pt覆盖失败的bug	2021-04-11 01:14:41 +08:00