2073 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
monktan	937ae76e43	Merge remote-tracking branch 'upstream/master'	2020-12-08 11:56:09 +08:00
monktan	394c540bba	Merge remote-tracking branch 'upstream/master'	2020-12-07 11:40:22 +08:00
ziyue	8b2fb0bc1f	修复Linux下编译问题	2020-12-06 22:36:44 +08:00
ziyue	c0a4170086	优化http api相关代码,方便自由添加不同类型的api	2020-12-06 21:50:41 +08:00
ziyue	dc3701e6cc	修复rtp存在ext时无法解析的bug:#585	2020-12-06 21:08:16 +08:00
ziyue	43164d3670	Merge remote-tracking branch 'origin/master'	2020-12-07 10:24:28 +08:00
xiongziliang	b90ebf6511	合并pr:#607	2020-12-05 12:31:28 +08:00
夏楚	955ecde533	Merge pull request #607 from alongL/master ... Update HttpTSPlayer.cpp	2020-12-05 12:29:20 +08:00
xiongziliang	3f37ef618d	删除文件太小的录像	2020-12-05 12:25:52 +08:00
xiongziliang	55cf411c1e	支持bitrate	2020-12-05 12:22:17 +08:00
ziyue	68926b4ae7	支持bitrate	2020-12-04 16:44:53 +08:00
along	7131649779	Update HttpTSPlayer.cpp ... 保存http status返回值，在非200或206的情况下，不再进行数据判断。	2020-12-03 10:23:46 +08:00
monktan	c9f698d374	merge upstream	2020-11-30 10:07:06 +08:00
monktan	575a231ba0	新增自定义rtmp command	2020-11-30 10:00:26 +08:00
xiongziliang	42679cdf98	更新第三方库，提升GB28281推流兼容性	2020-11-29 09:42:16 +08:00
xiongziliang	a64ce68592	解决单Track时，等待时间太长的问题	2020-11-29 09:38:04 +08:00
xiongziliang	a5b4da7db5	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into open_src	2020-11-29 09:36:12 +08:00
xiongziliang	c4c978be44	去除编译警告	2020-11-29 09:34:02 +08:00
xiongziliang	e7569c8cbc	删除多余日志	2020-11-29 09:33:49 +08:00
夏楚	5f01eb7f73	Merge pull request #599 from sunhui2013/master ... 解决RtpServer启动UDPServer收流造成崩溃问题	2020-11-29 09:27:58 +08:00
sunhui	48788cf25b	解决RtpServer启动UDPServer收流造成崩溃问题	2020-11-28 02:39:21 +08:00
monktan	8e575c0c78	解决合并冲突	2020-11-24 14:49:21 +08:00
xiongziliang	f7433b0f90	头文件中隐藏不必要的宏，避免宏蔓延：#554	2020-11-21 22:39:32 +08:00
xiongziliang	408a678ade	修复编译问题：#584	2020-11-21 22:32:01 +08:00
xiongziliang	751f42fe1e	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into open_src	2020-11-21 22:17:36 +08:00
xiongziliang	9c585ce5a1	http客户端，host字段添加port，防止异常：#579	2020-11-21 22:16:58 +08:00
xiongziliang	f05422bb65	c api支持国标推流:#578	2020-11-21 22:13:08 +08:00
xiongziliang	c512c1a02e	关闭vhost时，m3u8中ts文件不指定vhost：#560	2020-11-21 21:54:12 +08:00
monktan	6e8d19704e	Refactoring log	2020-11-18 12:00:23 +08:00
monktan	ccd96f676c	重构变量名	2020-11-17 16:00:37 +08:00
monktan	80ddf018d9	添加用户自定义serverid	2020-11-17 14:59:39 +08:00
monktan	634acdbdaf	Merge remote-tracking branch 'upstream/master'	2020-11-17 14:57:15 +08:00
monktan	2975a61d4a	修改配置文件表达错误	2020-11-16 14:58:16 +08:00
夏楚	e89459a935	修正错误	2020-11-16 11:46:04 +08:00
monktan	45ec80656d	修改配置文件表达错误	2020-11-16 10:27:49 +08:00
monktan	50f1b4ad4f	Merge remote-tracking branch 'upstream/master'	2020-11-16 10:26:31 +08:00
xiongziliang	1cc3add97f	提升按需转协议性能与体验	2020-11-15 00:59:31 +08:00
xiongziliang	0f54351811	按需转协议默认关闭(意即一直转协议)	2020-11-15 00:43:42 +08:00
xiongziliang	bb9b39d821	添加按需转协议开关，默认一直转协议：#569	2020-11-15 00:40:46 +08:00
xiongziliang	ebbe124d00	修复不能立即关闭拉流代理的问题：#559	2020-11-15 00:00:22 +08:00
xiongziliang	3d8f015f5d	GB28181推流，无人观看时不解复用数据	2020-11-14 23:11:28 +08:00
monktan	2b7d8ae295	Merge remote-tracking branch 'upstream/master'	2020-11-09 10:58:45 +08:00
monktan	67d80c94fa	合并代码	2020-11-09 10:58:33 +08:00
xiongziliang	6c8f1c9403	更新ZLToolKit，修复bug: #558	2020-11-08 21:42:36 +08:00
xiongziliang	9618748c65	默认hook地址置空，方便关闭hook ... 同时整理简化代码	2020-11-08 09:28:46 +08:00
xiongziliang	a93c57eb59	修复ehome推流相关bug: #549	2020-11-07 17:46:37 +08:00
xiongziliang	57a11f19dd	提高rtsp兼容性: #551	2020-11-07 17:45:58 +08:00
xiongziliang	ba7251f345	修复偶尔获取H265宽高失败的问题	2020-11-07 17:45:16 +08:00
xiongziliang	bad419e41f	修复cts小于0的问题	2020-11-07 17:44:30 +08:00
monktan	2107e58295	重置rtmp时间戳	2020-11-03 21:26:48 +08:00