amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 10:40:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,848 Commits 16 Branches 0 Tags 225 MiB
4bd3fdabfb
Commit Graph

225 Commits

Author SHA1 Message Date
xiongziliang
f226aed145 全面支持265(包括rtmp) 2020-04-04 23:20:42 +08:00
xiongziliang
ecf3847482 mp4转rtsp支持h265 2020-04-03 23:13:55 +08:00
夏楚
82dfaa55a5
Update README.md 2020-03-28 15:50:02 +08:00
夏楚
8324bab507
Update README.md 2020-03-18 22:19:33 +08:00
夏楚
8dfed858c1
Update README.md 2020-03-18 22:16:59 +08:00
夏楚
e0da4de5e1
Update README.md 2020-03-18 15:33:18 +08:00
xiongziliang
800b0d81f3 完善readme 2020-03-08 22:29:31 +08:00
夏楚
a245e6bec2
Update README.md 2020-02-28 23:08:44 +08:00
夏楚
0a4f2ad42c
Update README.md 2020-02-28 22:55:47 +08:00
xiongziliang
ead8b5a89c ios默认只生成c静态库 2020-02-05 23:34:51 +08:00
xiongziliang
bad036fdac 添加致谢 2020-01-09 10:06:30 +08:00
xiongziliang
09a2623e1b 还原 2020-01-07 15:16:01 +08:00
xiongziliang
77bbc7ae4d Merge remote-tracking branch 'FreeNVR/freenvr' 
# Conflicts:
#	server/FFmpegSource.cpp
#	server/Process.cpp
#	server/Process.h
#	server/System.cpp
 2020-01-07 15:08:15 +08:00
刘子龙
5b533354c3 增加todo 2020-01-07 11:17:55 +08:00
Luke
306e202ca1 1.添加windows下ffmpeg拉流分发支持，目前不是很完善，后续再修改 
2.server/system下未兼容完成
 2020-01-07 11:09:11 +08:00
夏楚
4591ece566
Update README.md 2020-01-06 14:23:23 +08:00
夏楚
3ddb9e4843
Update README.md 2020-01-06 14:19:15 +08:00
xiongziliang
37858f3b51 update readme 2019-12-25 11:33:31 +08:00
xiongziliang
3f9f9c4d81 完善readme 2019-12-24 18:35:46 +08:00
xiongziliang
0670f9f62b 更新ios编译方法 2019-12-16 17:12:24 +08:00
xiongziliang
0d9bdec182 支持rtp代理服务器 2019-12-06 11:54:10 +08:00
夏楚
d1fd674c36
Update README.md 2019-11-13 10:43:46 +08:00
Gemfield
814e94b6b0 Add Docker support 2019-11-08 16:50:23 +08:00
夏楚
f949ca0e7c
Update README.md 2019-10-28 13:55:01 +08:00
xiongziliang
4d84ae92f9 Support websocket client 2019-09-16 18:32:25 +08:00
夏楚
63caabf4f1
Update README.md 2019-08-20 09:54:23 +08:00
夏楚
e89e7af5e7
Update README.md 2019-08-20 09:45:21 +08:00
夏楚
18e326f598
Update README.md 2019-08-12 18:25:46 +08:00
xiongziliang
0980bde12d mp4录制支持h265 2019-08-01 22:32:04 +08:00
夏楚
d3d7fe1bd1
mp4录制支持H265 2019-08-01 22:28:47 +08:00
夏楚
5457d73ecc
Update README.md 2019-07-29 23:57:30 +08:00
夏楚
ac356319b8
Update README.md 2019-06-27 14:00:36 +08:00
夏楚
b4a07c028f
Update README.md 2019-06-26 09:33:11 +08:00
夏楚
0af676c32b
Update README.md 2019-06-25 18:52:12 +08:00
夏楚
7a03147d75
Update README.md 2019-06-25 18:50:01 +08:00
夏楚
57b8772cb9
Update README.md 2019-06-25 18:49:18 +08:00
xiongziliang
d3efca2930 add english readme 2019-06-25 18:46:47 +08:00
夏楚
a3754a0456
Update README.md 2019-06-14 21:54:11 +08:00
xiongziliang
477606d90c 更新readme 2019-06-13 14:38:37 +08:00
xiongziliang
87bb0a6f37 更新readme 2019-06-13 14:37:36 +08:00
夏楚
fe02688723
Update README.md 2019-06-11 12:13:47 +08:00
夏楚
d6b5e08e35
Update README.md 2019-06-03 16:22:35 +08:00
夏楚
a92b053267
Update README.md 2019-05-17 17:57:36 +08:00
夏楚
b69f0c2f87
Update README.md 2019-05-17 17:55:09 +08:00
夏楚
b9bd5c34db
Update README.md 2019-04-18 09:31:57 +08:00
夏楚
f95305af9b
Update README.md 2019-04-03 22:10:05 +08:00
夏楚
8e314ff82a
Update README.md 2019-04-01 16:11:32 +08:00
夏楚
2d701128d3
HLS支持265 2019-04-01 16:08:02 +08:00
夏楚
a80959cc10
Update README.md 2019-03-28 15:08:25 +08:00
夏楚
8b6991dc20
Update README.md 2019-03-28 12:08:31 +08:00
夏楚
3132cccb8f
支持rtsp推流 2019-03-28 12:07:46 +08:00
夏楚
c5531c9ddb
Update README.md 2019-03-26 15:40:43 +08:00
夏楚
22962a407e
Update README.md 2019-01-24 10:39:18 +08:00
xiongziliang
315cd180d4 完善README 2018-12-26 14:08:55 +08:00
夏楚
8d691e160e
Update README.md 2018-12-25 18:38:25 +08:00
xiongziliang
1d2398e34d 完善readme 2018-12-21 11:12:11 +08:00
xiongziliang
95fe653a45 完善Readme 2018-12-21 11:09:39 +08:00
夏楚
e8c24bdbc8
Update README.md 2018-12-21 10:07:19 +08:00
xiongziliang
314c4cfa7a 更新readme 2018-12-19 17:21:11 +08:00
xiongziliang
70c3e97f14 更新readme 2018-12-17 15:28:19 +08:00
夏楚
8154170515
Update README.md 2018-11-13 10:13:03 +08:00
夏楚
d3b34c7a98
Update README.md 2018-11-13 10:05:11 +08:00
xiongziliang
afdf028d6b 修复录制点播的bug 2018-11-04 21:49:34 +08:00
xiongziliang
f84038faa7 更新README 2018-10-29 14:09:29 +08:00
xiongziliang
50f7050ea9 更新 2018-09-25 10:19:11 +08:00
夏楚
9b8bfe8a66
Update README.md 2018-09-07 17:39:02 +08:00
夏楚
3ed2602fd7
Update README.md 2018-09-07 17:38:48 +08:00
夏楚
76ceeca964
Update README.md 2018-09-07 17:38:01 +08:00
夏楚
717779029e
Update README.md 2018-09-07 17:24:34 +08:00
xiongziliang
231f3df68f 更新功能描述 2018-07-02 16:05:07 +08:00
xiongziliang
b81392a9e1 更新功能描述 2018-07-02 16:03:27 +08:00
夏楚
3addd5452d
Update README.md 2018-03-21 17:17:58 +08:00
夏楚
bec36b257e
Update README.md 2018-03-20 11:50:37 +08:00
夏楚
42cc74cda7
Update README.md 2018-03-20 11:50:01 +08:00
夏楚
b6a01f286c
Update README.md 2018-03-20 11:48:05 +08:00
xiongziliang
961bff817f 修改编译脚本、readme 2018-03-19 10:45:31 +08:00
xiongziliang
f1b4a196c6 适配ZLToolKit develop分支 2018-02-23 15:36:51 +08:00
夏楚
723c1294c6
Update README.md 2017-12-28 15:24:18 +08:00
夏楚
7bf5451137
Update README.md 2017-12-27 11:24:09 +08:00
夏楚
45455de1a5
Update README.md 2017-12-15 16:10:41 +08:00
夏楚
5c83a905d6
Update README.md 2017-12-14 09:48:20 +08:00
夏楚
ceec650fd7
Update README.md 2017-12-14 09:47:22 +08:00
夏楚
34176f0e2b
Update README.md 2017-12-13 11:25:15 +08:00
夏楚
4a9bbdb5f2
rtsp支持鉴权 2017-12-10 01:44:06 +08:00
夏楚
5ce5da0d1d
新增rtsp鉴权 2017-12-10 01:42:14 +08:00
夏楚
f42e4299fd
添加测试报告 2017-12-03 17:51:32 +08:00
夏楚
a3102a68a5
Update README.md 2017-11-08 17:05:58 +08:00
夏楚
fa39514e52 windows下删除转码步骤 2017-10-10 00:07:49 +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
夏楚
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
夏楚
3210419ffa Update README.md 2017-08-28 10:04:43 +08:00
夏楚
965bc5d34f Update README.md 2017-08-15 12:03:10 +08:00
夏楚
8ac1490585 支持windows 2017-08-10 16:56:13 +08:00
夏楚
f64dd5b4c7 Update README.md 2017-06-06 20:15:08 +08:00
夏楚
f3fe820234 Update README.md 2017-06-05 18:13:49 +08:00
夏楚
0b83eddcbf Update README.md 2017-06-05 18:10:17 +08:00
夏楚
13574a050c Update README.md 2017-06-05 18:09:30 +08:00
夏楚
cf57738fd4 Update README.md 2017-06-05 18:08:31 +08:00
夏楚
6656fa0a61 Update README.md 2017-06-05 18:03:27 +08:00
夏楚
c85027b24c Update README.md 2017-06-05 18:00:34 +08:00
夏楚
1445b29390 Update README.md 2017-06-05 17:58:37 +08:00
夏楚
d327a244b9 Update README.md 2017-06-05 17:55:32 +08:00
夏楚
c448c15d02 Update README.md 2017-06-05 17:53:58 +08:00
夏楚
4906b988a4 Update README.md 2017-06-03 11:14:27 +08:00
夏楚
e7837a19ad Update README.md 2017-05-16 17:08:15 +08:00
夏楚
d644356c81 Update README.md 2017-05-11 23:20:31 +08:00
夏楚
e5621efc92 Update README.md 2017-05-06 00:07:32 +08:00
夏楚
b2e650f9f6 Update README.md 2017-05-03 00:16:53 +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
夏楚
f8d67ae38f Update README.md 2017-05-03 00:00:15 +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
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
xiongziliang
aef0ecbcb9 Initial commit 2017-04-01 16:30:26 +08:00