2987 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongziliang	bc64460327	修正文件路径	2017-05-23 16:48:33 +08:00
xzl	e92ad6b5b8	防止代理失败不重试的bug	2017-05-18 16:25:36 +08:00
xzl	9ef5a11579	添加对rtmp play2命令的支持	2017-05-18 16:24:36 +08:00
xzl	6d28fff604	修复rtmp bodySize为0崩溃的bug	2017-05-18 09:10:22 +08:00
xiongziliang	afb90f68ed	解决有些rtmp流由于bodySize为0无法播放的问题	2017-05-17 17:21:16 +08:00
xiongziliang	c2d5f5abed	修正rtmp绝对时间戳的bug	2017-05-17 11:52:59 +08:00
夏楚	e7837a19ad	Update README.md	2017-05-16 17:08:15 +08:00
xiongziliang	ef3e0733b6	修复IOS编译不通过的bug	2017-05-16 16:49:03 +08:00
xiongziliang	71b4cffe50	解决rtsp转rtmp时间戳回环失步的问题	2017-05-16 15:02:09 +08:00
xiongziliang	df3d09219e	支持rtmp complex handshark	2017-05-16 11:51:18 +08:00
xiongziliang	2d71e5d353	支持rtmp complex handshark	2017-05-16 11:45:36 +08:00
xiongziliang	acc6106f6e	适配flash player	2017-05-13 17:25:31 +08:00
xzl	c0477c897e	跟踪主线程	2017-05-13 10:28:55 +08:00
xzl	cce92ae29f	关闭log	2017-05-12 16:10:48 +08:00
xzl	b9294c87cc	播放器统一在主线程析构	2017-05-12 16:10:30 +08:00
xzl	fd9df3f5cf	防止线程竞争的bug	2017-05-12 13:59:58 +08:00
夏楚	53c2c92fb4	Update build_for_ios.sh	2017-05-11 23:47:13 +08:00
夏楚	0d15f25364	Update build_for_linux.sh	2017-05-11 23:45:51 +08:00
夏楚	d644356c81	Update README.md	2017-05-11 23:20:31 +08:00
xiongziliang	1dc81c5325	fixed	2017-05-11 23:10:30 +08:00
xiongziliang	d8b38dbc60	Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit ... fixed build liunx sh	2017-05-11 23:02:22 +08:00
xiongziliang	ed062bd368	fixed	2017-05-11 23:00:53 +08:00
夏楚	9b52300cca	Update .travis.yml	2017-05-11 22:57:26 +08:00
xiongziliang	42c26e6201	添加编译脚本	2017-05-11 22:55:29 +08:00
xiongziliang	d619296fe5	精简	2017-05-11 22:10:12 +08:00
xiongziliang	a4233bdeb8	添加对mac的支持	2017-05-11 18:03:06 +08:00
xiongziliang	1a6840d3be	fix bug in mac	2017-05-11 17:09:00 +08:00
xzl	d486ad9db2	添加说明	2017-05-11 11:27:01 +08:00
xzl	821d693f32	添加海康IPC的接入源码	2017-05-11 11:26:45 +08:00
xzl	4b48a24ad9	修复一个rtmp播放器跨线程操作的bug	2017-05-11 11:06:34 +08:00
xzl	60590c1de7	添加读写配置文件	2017-05-09 16:52:31 +08:00
xzl	8db012775b	regist rtmp after all is ready	2017-05-09 16:40:42 +08:00
xzl	5eefeca430	添加性能测试用例	2017-05-09 10:45:55 +08:00
xzl	a7f438d84f	加大tpc会话限制数量	2017-05-09 10:45:29 +08:00
xzl	b646355545	添加播放器测试程序	2017-05-08 18:03:43 +08:00
夏楚	e5621efc92	Update README.md	2017-05-06 00:07:32 +08:00
xiongziliang	55a4c63cfa	添加http客户端测试代码	2017-05-05 23:54:59 +08:00
xiongziliang	ca54cb9d31	解决断点续传返回416的问题	2017-05-05 23:54:30 +08:00
xiongziliang	ae4c724005	add debug log	2017-05-05 23:53:09 +08:00
xiongziliang	a994e075b4	add test for telnet	2017-05-05 21:29:44 +08:00
xiongziliang	56078f3ba0	add method for add user	2017-05-05 21:29:12 +08:00
xiongziliang	e91525e96e	添加不区分大小写的map	2017-05-05 18:04:23 +08:00
xiongziliang	6a411da024	add api for ini file	2017-05-05 18:03:23 +08:00
xiongziliang	f1a41022cb	add http client	2017-05-05 18:02:54 +08:00
xiongziliang	5901ff197d	修复rtp组播的bug	2017-05-04 09:47:02 +08:00
夏楚	b2e650f9f6	Update README.md	2017-05-03 00:16:53 +08:00
xiongziliang	3fa3f1e46d	update	2017-05-03 00:12:51 +08:00
xiongziliang	d27f7107e1	fix bug in clang++	2017-05-03 00:05:30 +08:00
夏楚	4490fe6863	Update README.md	2017-05-03 00:03:48 +08:00
夏楚	22f79f475b	Update README.md	2017-05-03 00:02:02 +08:00