298 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xzl	72a6d2db61	修正计算sha256异常崩溃的bug	2017-05-27 17:36:51 +08:00
xzl	49ef6c4fc1	关闭多余的log	2017-05-27 14:37:40 +08:00
xzl	305f272344	修正rtmp时间戳的bug	2017-05-27 14:37:19 +08:00
xzl	e3c1fb3648	调整rtmp 的音视频chunkID以及其他细节	2017-05-27 11:26:49 +08:00
xzl	c3231d2156	修正rtmp时间戳异常的bug	2017-05-27 10:10:07 +08:00
xzl	9a2d54ce9a	修正rtmp时间戳异常的bug	2017-05-27 09:42:08 +08:00
xzl	a1742d41e9	update for Android	2017-05-26 10:59:24 +08:00
xzl	f21f2ba7ac	适配Android	2017-05-25 17:59:40 +08:00
xzl	f6e79584ce	适配Android	2017-05-25 17:41:58 +08:00
xzl	ebf1c53543	http文件下载器改成默认不断点续传	2017-05-24 14:29:47 +08:00
xzl	1b78f7ae5a	文件下载失败删除不完整文件	2017-05-24 09:56:54 +08:00
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