526 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
夏楚	882210abd2	Update benchmark.md	2017-12-04 17:59:48 +08:00
夏楚	9735541894	Update benchmark.md	2017-12-04 17:53:31 +08:00
夏楚	9ac224f026	Update benchmark.md	2017-12-04 13:49:34 +08:00
夏楚	f42e4299fd	添加测试报告	2017-12-03 17:51:32 +08:00
夏楚	f38a21e99f	Update benchmark.md	2017-12-03 17:47:33 +08:00
夏楚	7754aee764	Update benchmark.md	2017-12-03 17:46:51 +08:00
xiongziliang	0f89fbe937	添加测试报告	2017-12-03 17:45:54 +08:00
夏楚	c8c1eee25d	Update CMakeLists.txt	2017-12-01 18:26:48 +08:00
xiongziliang	473b9356a6	ShellSession跟业务隔离	2017-12-01 11:42:49 +08:00
xiongziliang	e2d509e63f	Merge branch 'master' of github.com:xiongziliang/ZLMediaKit ... merge	2017-11-09 18:14:44 +08:00
xiongziliang	0588c47bd2	优化HLS延时	2017-11-09 18:14:16 +08:00
夏楚	a3102a68a5	Update README.md	2017-11-08 17:05:58 +08:00
xiongziliang	45070dbfff	支持rtcp心跳包	2017-11-08 16:57:05 +08:00
xiongziliang	101261c299	支持rtcp心跳包	2017-11-08 16:56:02 +08:00
xiongziliang	8242ad674d	删除cmake log	2017-10-19 16:22:26 +08:00
xiongziliang	f5138163fb	修改cmake脚本	2017-10-13 15:44:59 +08:00
xiongziliang	556552d224	修改cmake脚本	2017-10-13 15:23:37 +08:00
xiongziliang	73c4740453	添加build快捷方式	2017-10-13 15:19:24 +08:00
xiongziliang	c0d6765662	fixed	2017-10-10 00:11:58 +08:00
夏楚	fa39514e52	windows下删除转码步骤	2017-10-10 00:07:49 +08:00
xiongziliang	e1b732e944	windows支持gb2312编码	2017-10-10 00:04:07 +08:00
xiongziliang	d26d484ecf	“添加bom头	2017-10-09 22:11:01 +08:00
夏楚	fecfbbe101	修复windows下编译不过的bug	2017-10-09 11:24:00 +08:00
夏楚	4a6b5bc46a	Update README.md	2017-10-09 11:13:31 +08:00
夏楚	bf6b964f95	Update README.md	2017-10-09 11:06:59 +08:00
xiongziliang	c367df73a5	整理代码，添加注释	2017-09-30 13:00:12 +08:00
夏楚	e6bdfbce5c	Create README.md	2017-09-28 15:32:55 +08:00
xiongziliang	e3272e0d89	add zltoolkit	2017-09-27 17:09:42 +08:00
夏楚	66083173c0	Delete .gitmodules	2017-09-27 16:59:36 +08:00
夏楚	85a8e69621	Create .gitmodules	2017-09-27 16:52:32 +08:00
夏楚	dd49042279	Update LICENSE	2017-09-27 16:26:24 +08:00
xiongziliang	1d1d2516e9	添加版权信息	2017-09-27 16:20:30 +08:00
xiongziliang	8732cbf2b8	修改拼写错误	2017-09-27 14:52:34 +08:00
xiongziliang	80b80c2ab8	提高兼容性	2017-09-22 20:01:12 +08:00
xiongziliang	9a2f0fb547	update	2017-09-21 16:55:30 +08:00
xiongziliang	46d1d80954	添加兼容性适配代码	2017-09-21 16:51:44 +08:00
夏楚	2c34ac6de7	Update README.md	2017-09-14 11:20:25 +08:00
夏楚	e89134e077	Update README.md	2017-09-14 11:11:13 +08:00
夏楚	a0e6aa2fb4	Update README.md	2017-09-14 11:08:43 +08:00
xiongziliang	f68dddfa9c	添加rtmp推流mp4文件范例	2017-09-05 19:51:25 +08:00
xzl	2aecc862b8	添加时间戳增量纠偏逻辑	2017-09-05 15:20:02 +08:00
xzl	9c8f604868	修复Http POST Content为空不响应的bug	2017-09-04 15:39:05 +08:00
夏楚	3210419ffa	Update README.md	2017-08-28 10:04:43 +08:00
xiongziliang	a93628bd35	新增加aac不带adts头输入接口	2017-08-24 09:54:25 +08:00
夏楚	965bc5d34f	Update README.md	2017-08-15 12:03:10 +08:00
xiongziliang	318ab7e29e	Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit	2017-08-14 22:22:06 +08:00
xiongziliang	91ebb5db46	修正拼写错误	2017-08-14 22:20:53 +08:00
夏楚	8ac1490585	支持windows	2017-08-10 16:56:13 +08:00
xiongziliang	51eebe112e	windows下添加telnet的支持	2017-08-10 16:16:42 +08:00
xiongziliang	0d03ae6cd2	修正posix系统下编译失败的bug	2017-08-10 14:31:04 +08:00