2053 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongziliang	1f43359b31	Merge branch 'master' of https://github.com/baiyfcu/ZLMediaKit	2020-04-18 16:05:49 +08:00
baiyfcu	40afa204d5	增加rtmp/rtsp对音频G711A,G711U的支持	2020-04-17 17:47:10 +08:00
xiongziliang	1a97c2e3cd	优化特定情况下丢帧问题	2020-04-17 15:19:42 +08:00
xiongziliang	1f02144225	完善录制相关api错误提示	2020-04-16 21:31:07 +08:00
xiongziliang	6b621d42db	优化接口	2020-04-15 22:30:24 +08:00
xiongziliang	7823d2c1d8	修复为安装openssl编译失败的问题	2020-04-13 17:30:38 +08:00
xiongziliang	d363871601	修复一些mp4点播不支持的问题	2020-04-13 09:44:05 +08:00
xiongziliang	048b30c41c	Merge remote-tracking branch 'origin/master'	2020-04-10 18:58:36 +08:00
xiongziliang	c8d4edac9c	修复不支持多级ssl证书的问题:#257	2020-04-10 18:58:14 +08:00
夏楚	7e78af7527	Update README.md	2020-04-10 15:19:08 +08:00
xiongziliang	c18a065b08	Merge remote-tracking branch 'origin/master'	2020-04-10 14:08:33 +08:00
xiongziliang	895e7d4714	完善rtp推流	2020-04-10 14:08:10 +08:00
夏楚	b30105892d	Update README.md	2020-04-09 22:51:51 +08:00
夏楚	54874ed865	Update README.md	2020-04-09 22:50:12 +08:00
夏楚	1174046e32	Update README.md	2020-04-09 22:48:20 +08:00
夏楚	8650cd18d1	Update README.md	2020-04-09 22:47:19 +08:00
夏楚	00a2ef496c	Update README.md	2020-04-09 22:34:39 +08:00
夏楚	53e9043a98	Update README.md	2020-04-09 22:19:47 +08:00
夏楚	9173c5e0af	Update README.md	2020-04-09 22:17:58 +08:00
夏楚	15f5279e22	Update README.md	2020-04-09 22:16:56 +08:00
xiongziliang	99a55ddaaa	添加合并写功能	2020-04-09 16:19:03 +08:00
baiyfcu	5fcc22bab7	useBuf暂定为true时seek失败	2020-04-08 16:15:47 +08:00
baiyfcu	340629cdc6	添加对g711A/U rtsp支持相关文件，api添加windows静态库编译选项，g711 RTMP支持尚未修改	2020-04-08 15:42:52 +08:00
baiyfcu	fb77293648	修复rtsp seek播放时rtsp server返回npt字段不对问题	2020-04-08 15:37:16 +08:00
xiongziliang	8a8da61ef5	防止windows下字符编码错误	2020-04-08 13:54:44 +08:00
xiongziliang	0fc1499643	添加性能测试模式	2020-04-08 11:16:09 +08:00
baiyfcu	f7fa4e6407	Merge pull request #12 from xiongziliang/master ... update	2020-04-08 09:14:20 +08:00
xiongziliang	5025d7d4cc	修复rtsp点播时不触发播放成功回调的问题	2020-04-07 18:09:25 +08:00
xiongziliang	43579a5618	Merge remote-tracking branch 'origin/master'	2020-04-07 13:11:05 +08:00
xiongziliang	b169f94cce	大幅提高rtsp服务器性能	2020-04-07 13:03:53 +08:00
夏楚	84be3fbfc1	Merge pull request #262 from gemfield/master ... Update Dockerfile to 20.04 version	2020-04-07 10:32:49 +08:00
xiongziliang	1352e159f1	优化性能	2020-04-07 10:26:07 +08:00
Gemfield	8e3cbd11d3	Update Dockerfile to 20.04 version	2020-04-06 15:52:45 +00:00
xiongziliang	4d74360609	去除多余依赖	2020-04-06 21:57:14 +08:00
xiongziliang	1896b1d768	优化代码	2020-04-06 21:44:32 +08:00
xiongziliang	45c5f1ec4c	避免死锁	2020-04-06 21:23:35 +08:00
xiongziliang	e192931429	修复动态添加HlsMediaSource后无法获取Track列表的问题	2020-04-05 10:32:42 +08:00
xiongziliang	d3db5e0ce0	完善录制相关功能	2020-04-05 09:48:38 +08:00
xiongziliang	e5d5cabf89	部分恢复录制相关接口	2020-04-05 09:26:29 +08:00
xiongziliang	c040f472fa	更新第三方库，防止windows下编译失败	2020-04-04 23:24:11 +08:00
xiongziliang	898e774311	Merge remote-tracking branch 'origin/master'	2020-04-04 23:21:22 +08:00
xiongziliang	f226aed145	全面支持265(包括rtmp)	2020-04-04 23:20:42 +08:00
xiongziliang	070c2c46d7	完善代码	2020-04-04 23:13:10 +08:00
xiongziliang	c25307a105	新增H265 rtmp支持	2020-04-04 22:55:06 +08:00
xiongziliang	83400290a8	整理rtmp相关代码	2020-04-04 22:54:49 +08:00
夏楚	02be60e5c9	Update AUTHORS	2020-04-04 20:35:22 +08:00
xiongziliang	7019e4717c	整理授权协议	2020-04-04 20:30:09 +08:00
xiongziliang	11420b868b	整理代码	2020-04-04 19:55:11 +08:00
xiongziliang	67f4ca4b83	修复mp4循环点播逻辑不生效的bug	2020-04-04 16:08:31 +08:00
xiongziliang	708300951b	优化rtmp点播	2020-04-04 15:37:37 +08:00