1380 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongziliang	996ff47d26	Merge remote-tracking branch 'origin/master'	2019-12-04 18:36:57 +08:00
xiongziliang	b3fcb4c038	重写mp4录制驱动机制	2019-12-04 18:36:30 +08:00
夏楚	a79bee1d88	Update README_CN.md	2019-12-04 12:11:36 +08:00
xiongziliang	d5a81d7105	规范命名	2019-12-04 10:59:13 +08:00
xiongziliang	de77460621	修复编译失败问题	2019-12-04 10:52:26 +08:00
xiongziliang	de33d6a847	整理文件录制	2019-12-04 10:45:38 +08:00
xiongziliang	2c2e7262d6	修复bug	2019-12-03 16:14:52 +08:00
xiongziliang	5249c24430	整理MediaSource代码	2019-12-03 16:10:02 +08:00
xiongziliang	68718953d4	优化代码	2019-12-03 13:05:23 +08:00
xiongziliang	b50a34bf1f	优化代码	2019-12-03 12:43:48 +08:00
xiongziliang	c55f26fba7	整理MediaSink	2019-12-03 12:32:57 +08:00
xiongziliang	c1ab73f758	修复类型转换失败的bug	2019-11-30 22:14:22 +08:00
xiongziliang	cadff93d4d	1、hls cookie改成60秒有效期并且访问时刷新cookie ... 2、去除keep-alive下最大请求次数限制	2019-11-30 14:29:44 +08:00
xiongziliang	d46b67a5cf	精简代码	2019-11-30 11:56:40 +08:00
xiongziliang	12346f77a4	修复编译问题	2019-11-30 11:44:05 +08:00
xiongziliang	a44ab25d46	整理http文件服务器相关代码	2019-11-30 11:38:00 +08:00
xiongziliang	ee528b2bfb	Merge remote-tracking branch 'origin/master'	2019-11-29 11:59:55 +08:00
xiongziliang	9b6ee8131b	hls用作点播时，那么m3u8文件实时记录为点播	2019-11-29 11:59:39 +08:00
夏楚	64a1255b76	Update README_CN.md	2019-11-29 11:36:26 +08:00
xiongziliang	0c79af024c	切换submodule至gitee	2019-11-29 11:32:17 +08:00
xiongziliang	5e9291e035	添加启动失败处理逻辑	2019-11-29 11:27:54 +08:00
xiongziliang	22c01d0a03	完善范例配置文件	2019-11-29 10:14:08 +08:00
xiongziliang	d587ddf7ef	添加服务器启动报告	2019-11-29 10:12:20 +08:00
xiongziliang	544135b2d7	Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit	2019-11-29 09:57:11 +08:00
xiongziliang	c42ee1dc5d	优化时间戳覆盖逻辑:#148	2019-11-29 09:54:48 +08:00
夏楚	e84af6a9e2	Update ccpp.yml	2019-11-26 09:52:20 +08:00
xiongziliang	bf70a01f6a	提升rtsp的兼容性	2019-11-25 17:59:04 +08:00
xiongziliang	21cf3bcee0	播放器track未初始化成功时间改成最大为5秒	2019-11-21 18:07:40 +08:00
xiongziliang	ab97486200	完善判断逻辑	2019-11-21 16:34:18 +08:00
xiongziliang	54f2c0b53c	兼容一些奇怪sdp的rtsp url	2019-11-21 16:31:50 +08:00
xiongziliang	e7bd5a4174	兼容一些奇怪的sdp	2019-11-21 15:11:43 +08:00
xiongziliang	083933cbad	修复访问野指针的问题：#146	2019-11-21 13:46:42 +08:00
xiongziliang	e6d511cc9e	解决播放成功与中途断开事件触发紊乱的问题:#143	2019-11-19 15:52:02 +08:00
xiongziliang	85cd4a7d02	修复遍历删除可能崩溃的bug	2019-11-19 10:55:44 +08:00
xiongziliang	2eb64d2c39	确保rtp端口为偶数，rtcp端口为奇数	2019-11-19 10:20:57 +08:00
xiongziliang	517f3c229c	添加kick_sessions接口	2019-11-18 16:34:39 +08:00
xiongziliang	bcc5c839a5	close_stream接口结果返回字段改成result	2019-11-18 16:28:56 +08:00
xiongziliang	f628985037	优化代码	2019-11-18 16:16:56 +08:00
xiongziliang	0d42aab9e7	修复FFmpeg拉流代理无法通过close_stream接口关闭的bug	2019-11-18 12:07:11 +08:00
xiongziliang	ddf351d350	添加close_streams接口	2019-11-18 10:46:59 +08:00
xiongziliang	a993132a59	修复FFmpeg拉流代理卡顿的问题	2019-11-15 13:50:42 +08:00
夏楚	08ad39d005	Update ccpp.yml	2019-11-14 15:26:35 +08:00
夏楚	2543ee01dc	Update ccpp.yml	2019-11-14 15:22:15 +08:00
xiongziliang	a3e67a1306	完成workflows测试	2019-11-14 15:14:25 +08:00
xiongziliang	c8ba6fd73f	更新ZLToolKit	2019-11-14 14:48:27 +08:00
夏楚	c1f3b8ffbc	Create ccpp.yml	2019-11-14 14:45:12 +08:00
xiongziliang	d440c424c4	获取线程负载接口返回code字段 ... 简化代码	2019-11-13 14:33:19 +08:00
xiongziliang	aef8fb8849	添加isMediaOnline接口判断是否媒体在线	2019-11-13 14:26:12 +08:00
xiongziliang	9665d557ae	兼容拼写错误	2019-11-13 14:11:49 +08:00
xiongziliang	0522ad2677	Merge remote-tracking branch 'origin/master'	2019-11-13 14:05:33 +08:00