233 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongziliang	74d3a75bbb	add test for multi server	2017-05-02 23:43:10 +08:00
xiongziliang	777bd95358	move cmake file	2017-05-02 23:42:35 +08:00
xiongziliang	06e7f93ff0	add cmake file	2017-05-02 18:10:47 +08:00
xiongziliang	4a021e17bc	调整目录结构	2017-05-02 17:15:12 +08:00
xiongziliang	08387d5836	update	2017-05-02 17:09:25 +08:00
xiongziliang	7d73f44c73	mv to Common folder	2017-05-02 17:08:57 +08:00
xiongziliang	f178bfede3	update	2017-05-02 17:07:32 +08:00
xiongziliang	bf9b575569	ENABLE_MEDIAFILE宏拆分为ENABLE_HLS和ENABLE_MP4V2	2017-05-02 17:07:02 +08:00
xiongziliang	810bb71e21	fix MedaiFile to MediaFile	2017-05-02 16:34:25 +08:00
xiongziliang	b74028de64	fix MedaiFile to MediaFile	2017-05-02 16:33:49 +08:00
xiongziliang	d5726d95aa	update	2017-05-02 13:44:42 +08:00
xiongziliang	d7d90b3e0a	add makefle	2017-05-02 13:44:23 +08:00
xiongzilaing	0eb82e4627	整理代码	2017-04-25 11:35:41 +08:00
xiongziliang	5ae69f6e57	Update README.md	2017-04-23 14:48:54 +08:00
xiongziliang	2bc89d07a7	Update README.md	2017-04-22 23:37:07 +08:00
xiongziliang	0c2d38aafb	update for how to make	2017-04-22 22:57:43 +08:00
xiongziliang	c8577169d9	update	2017-04-22 22:52:29 +08:00
xiongziliang	7c9b52572e	update	2017-04-22 21:48:02 +08:00
xiongziliang	c628def253	update	2017-04-22 21:47:03 +08:00
xiongziliang	99511f33ab	update	2017-04-22 21:45:58 +08:00
xzl	9962dc4191	添加媒体源demo	2017-04-20 11:56:31 +08:00
xzl	6ff60dd56e	新增Https支持	2017-04-19 17:47:07 +08:00
xzl	52e25fc08c	添加打印log	2017-04-18 14:43:04 +08:00
xzl	84da660754	更该配置项名称	2017-04-13 17:38:25 +08:00
xzl	e2ce16c70b	Http服务改成异步回复模式	2017-04-10 17:24:06 +08:00
xiongziliang	f71a32bc8c	测试用例 ... 测试用例	2017-04-05 09:39:16 +08:00
xzl	f21a367d92	Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit.git	2017-04-01 16:47:03 +08:00
xzl	79ef1e727b	删除生成文件	2017-04-01 16:45:53 +08:00
xiongziliang	1d9f56b6c2	Update README.md	2017-04-01 16:43:10 +08:00
xiongziliang	4d647d4846	Update README.md	2017-04-01 16:42:00 +08:00
xiongziliang	26a85aa8dc	Update README.md	2017-04-01 16:41:09 +08:00
xzl	3f73024a9b	初始提交	2017-04-01 16:35:56 +08:00
xiongziliang	aef0ecbcb9	Initial commit	2017-04-01 16:30:26 +08:00