Commit Graph

Select branches

Hide Pull Requests

1.0

2.0

3.0

4.0

5.0

6.0

7.0

8.0

copilot/reliable-udp-projects

feature/async_write_file

feature/dynamic_library

feature/hls_record_disk

feature/log_context

feature/transcode

feature/transcode2

master

#1

#1

#10

#10

#11

#11

#12

#12

#13

#13

#14

#14

#15

#15

#16

#16

#17

#17

#18

#18

#19

#19

#2

#2

#20

#20

#21

#21

#22

#23

#23

#24

#24

#25

#25

#26

#26

#27

#27

#28

#28

#29

#29

#3

#3

#30

#30

#31

#31

#32

#32

#33

#33

#34

#34

#4

#4

#5

#5

#6

#6

#7

#7

#8

#8

#9

#9

Mono Color

• 20344feec0 修改目标文件目录 xiongziliang 2017-06-20 14:37:09 +0800
• f3b5c8f75b 新增支持播发器画面秒开功能 xiongziliang 2017-06-20 11:46:17 +0800
• 24bbdb48cb Create .travis.yml 夏楚 2017-06-09 21:49:57 +0800
• 1d1182efd2 支持gcc4.7~gcc4.9 xiongziliang 2017-06-09 17:45:13 +0800
• 9cd016c9eb 修复设置Http头的bug xzl 2017-06-09 16:05:33 +0800
• f64dd5b4c7 Update README.md 夏楚 2017-06-06 20:15:08 +0800
• 8f847ffb78 添加Rtmp推流示例 xiongziliang 2017-06-06 20:08:59 +0800
• 568d8ad53f 添加Rtmp推流示例 xiongziliang 2017-06-06 20:06:31 +0800
• f3fe820234 Update README.md 夏楚 2017-06-05 18:13:49 +0800
• 0b83eddcbf Update README.md 夏楚 2017-06-05 18:10:17 +0800
• 13574a050c Update README.md 夏楚 2017-06-05 18:09:30 +0800
• cf57738fd4 Update README.md 夏楚 2017-06-05 18:08:31 +0800
• 6656fa0a61 Update README.md 夏楚 2017-06-05 18:03:27 +0800
• c85027b24c Update README.md 夏楚 2017-06-05 18:00:34 +0800
• 1445b29390 Update README.md 夏楚 2017-06-05 17:58:37 +0800
• d327a244b9 Update README.md 夏楚 2017-06-05 17:55:32 +0800
• c448c15d02 Update README.md 夏楚 2017-06-05 17:53:58 +0800
• 4906b988a4 Update README.md 夏楚 2017-06-03 11:14:27 +0800
• e165849c35 提供Android编译支持 xiongziliang 2017-06-03 10:52:49 +0800
• 72a6d2db61 修正计算sha256异常崩溃的bug xzl 2017-05-27 17:36:51 +0800
• 49ef6c4fc1 关闭多余的log xzl 2017-05-27 14:37:40 +0800
• 305f272344 修正rtmp时间戳的bug xzl 2017-05-27 14:37:19 +0800
• e3c1fb3648 调整rtmp 的音视频chunkID以及其他细节 xzl 2017-05-27 11:26:49 +0800
• c3231d2156 修正rtmp时间戳异常的bug xzl 2017-05-27 10:10:07 +0800
• 9a2d54ce9a 修正rtmp时间戳异常的bug xzl 2017-05-27 09:42:08 +0800
• a1742d41e9 update for Android xzl 2017-05-26 10:59:24 +0800
• f21f2ba7ac 适配Android xzl 2017-05-25 17:59:40 +0800
• f6e79584ce 适配Android xzl 2017-05-25 17:41:58 +0800
• ebf1c53543 http文件下载器改成默认不断点续传 xzl 2017-05-24 14:29:47 +0800
• 1b78f7ae5a 文件下载失败删除不完整文件 xzl 2017-05-24 09:56:54 +0800
• bc64460327 修正文件路径 xiongziliang 2017-05-23 16:48:33 +0800
• e92ad6b5b8 防止代理失败不重试的bug xzl 2017-05-18 16:25:36 +0800
• 9ef5a11579 添加对rtmp play2命令的支持 xzl 2017-05-18 16:24:36 +0800
• 6d28fff604 修复rtmp bodySize为0崩溃的bug xzl 2017-05-18 09:10:22 +0800
• afb90f68ed 解决有些rtmp流由于bodySize为0无法播放的问题 xiongziliang 2017-05-17 17:21:16 +0800
• c2d5f5abed 修正rtmp绝对时间戳的bug xiongziliang 2017-05-17 11:52:59 +0800
• e7837a19ad Update README.md 夏楚 2017-05-16 17:08:15 +0800
• ef3e0733b6 修复IOS编译不通过的bug xiongziliang 2017-05-16 16:49:03 +0800
• 71b4cffe50 解决rtsp转rtmp时间戳回环失步的问题 xiongziliang 2017-05-16 15:02:09 +0800
• df3d09219e 支持rtmp complex handshark xiongziliang 2017-05-16 11:51:18 +0800
• 2d71e5d353 支持rtmp complex handshark xiongziliang 2017-05-16 11:45:36 +0800
• acc6106f6e 适配flash player xiongziliang 2017-05-13 17:25:31 +0800
• c0477c897e 跟踪主线程 xzl 2017-05-13 10:28:55 +0800
• cce92ae29f 关闭log xzl 2017-05-12 16:10:48 +0800
• b9294c87cc 播放器统一在主线程析构 xzl 2017-05-12 16:10:30 +0800
• fd9df3f5cf 防止线程竞争的bug xzl 2017-05-12 13:59:58 +0800
• 53c2c92fb4 Update build_for_ios.sh 夏楚 2017-05-11 23:47:13 +0800
• 0d15f25364 Update build_for_linux.sh 夏楚 2017-05-11 23:45:51 +0800
• d644356c81 Update README.md 夏楚 2017-05-11 23:20:31 +0800
• 1dc81c5325 fixed xiongziliang 2017-05-11 23:10:30 +0800
• d8b38dbc60 Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit fixed build liunx sh xiongziliang 2017-05-11 23:02:22 +0800
• ed062bd368 fixed xiongziliang 2017-05-11 23:00:53 +0800
• 9b52300cca Update .travis.yml 夏楚 2017-05-11 22:57:26 +0800
• 42c26e6201 添加编译脚本 xiongziliang 2017-05-11 22:55:29 +0800
• d619296fe5 精简 xiongziliang 2017-05-11 22:10:12 +0800
• a4233bdeb8 添加对mac的支持 xiongziliang 2017-05-11 18:03:06 +0800
• 1a6840d3be fix bug in mac xiongziliang 2017-05-11 17:09:00 +0800
• d486ad9db2 添加说明 xzl 2017-05-11 11:27:01 +0800
• 821d693f32 添加海康IPC的接入源码 xzl 2017-05-11 11:26:45 +0800
• 4b48a24ad9 修复一个rtmp播放器跨线程操作的bug xzl 2017-05-11 11:06:34 +0800
• 60590c1de7 添加读写配置文件 xzl 2017-05-09 16:52:31 +0800
• 8db012775b regist rtmp after all is ready xzl 2017-05-09 16:40:42 +0800
• 5eefeca430 添加性能测试用例 xzl 2017-05-09 10:45:55 +0800
• a7f438d84f 加大tpc会话限制数量 xzl 2017-05-09 10:45:29 +0800
• b646355545 添加播放器测试程序 xzl 2017-05-08 18:03:43 +0800
• e5621efc92 Update README.md 夏楚 2017-05-06 00:07:32 +0800
• 55a4c63cfa 添加http客户端测试代码 xiongziliang 2017-05-05 23:54:59 +0800
• ca54cb9d31 解决断点续传返回416的问题 xiongziliang 2017-05-05 23:54:30 +0800
• ae4c724005 add debug log xiongziliang 2017-05-05 23:53:09 +0800
• a994e075b4 add test for telnet xiongziliang 2017-05-05 21:29:44 +0800
• 56078f3ba0 add method for add user xiongziliang 2017-05-05 21:29:12 +0800
• e91525e96e 添加不区分大小写的map xiongziliang 2017-05-05 18:04:23 +0800
• 6a411da024 add api for ini file xiongziliang 2017-05-05 18:03:23 +0800
• f1a41022cb add http client xiongziliang 2017-05-05 18:02:54 +0800
• 5901ff197d 修复rtp组播的bug xiongziliang 2017-05-04 09:47:02 +0800
• b2e650f9f6 Update README.md 夏楚 2017-05-03 00:16:53 +0800
• 3fa3f1e46d update xiongziliang 2017-05-03 00:12:51 +0800
• d27f7107e1 fix bug in clang++ xiongziliang 2017-05-03 00:05:30 +0800
• 4490fe6863 Update README.md 夏楚 2017-05-03 00:03:48 +0800
• 22f79f475b Update README.md 夏楚 2017-05-03 00:02:02 +0800
• f8d67ae38f Update README.md 夏楚 2017-05-03 00:00:15 +0800
• 8ac681682c update xiongziliang 2017-05-02 23:48:37 +0800
• 3e68360cea rm x64 folder xiongziliang 2017-05-02 23:44:03 +0800
• d014ba12a2 add yml file xiongziliang 2017-05-02 23:43:33 +0800
• 74d3a75bbb add test for multi server xiongziliang 2017-05-02 23:43:10 +0800
• 777bd95358 move cmake file xiongziliang 2017-05-02 23:42:35 +0800
• 06e7f93ff0 add cmake file xiongziliang 2017-05-02 18:10:47 +0800
• 4a021e17bc 调整目录结构 xiongziliang 2017-05-02 17:15:12 +0800
• 08387d5836 update xiongziliang 2017-05-02 17:09:25 +0800
• 7d73f44c73 mv to Common folder xiongziliang 2017-05-02 17:08:57 +0800
• f178bfede3 update xiongziliang 2017-05-02 17:07:32 +0800
• bf9b575569 ENABLE_MEDIAFILE宏拆分为ENABLE_HLS和ENABLE_MP4V2 xiongziliang 2017-05-02 17:07:02 +0800
• 810bb71e21 fix MedaiFile to MediaFile xiongziliang 2017-05-02 16:34:25 +0800
• b74028de64 fix MedaiFile to MediaFile xiongziliang 2017-05-02 16:33:49 +0800
• d5726d95aa update xiongziliang 2017-05-02 13:44:42 +0800
• d7d90b3e0a add makefle xiongziliang 2017-05-02 13:44:23 +0800
• 0eb82e4627 整理代码 xiongzilaing 2017-04-25 11:35:41 +0800
• 5ae69f6e57 Update README.md xiongziliang 2017-04-23 14:48:54 +0800
• 2bc89d07a7 Update README.md xiongziliang 2017-04-22 23:37:07 +0800
• 0c2d38aafb update for how to make xiongziliang 2017-04-22 22:57:43 +0800