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

• 1f89019818 写mp4文件缓存可配置 xiongziliang 2019-08-01 22:13:26 +0800
• 13a6d3ac16 完善写mp4文件 xiongziliang 2019-08-01 22:07:40 +0800
• 6c0d89f417 修复生成mp4相关bug xiongziliang 2019-08-01 21:59:26 +0800
• 6d8db7d232 修复bug xiongziliang 2019-08-01 19:09:14 +0800
• 383a14a76d 重新mp4录制 xiongziliang 2019-08-01 18:49:04 +0800
• 12e1068a39 Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit into zqsong xiongziliang 2019-08-01 14:53:59 +0800
• e13ae419ae 精简H264Frame对象，删除多余字段 xiongziliang 2019-08-01 14:39:09 +0800
• 69098612bc Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit into zqsong xiongziliang 2019-08-01 14:06:34 +0800
• ad83b39b0f
  Merge pull request #3 from zlmediakit/master baiyfcu 2019-08-01 13:27:56 +0800
• 2e95c3b2fa 修改Rtmp播放结果回调事件触发机制，防止秒开失败以及获取Track失败 xiongziliang 2019-08-01 13:12:24 +0800
• fcdcf12af9 更新ZLToolKit 修好GOP缓存不够导致秒开失败的bug xiongziliang 2019-08-01 13:06:54 +0800
• 776dd4c085 恢复CMakeLists.txt zqsong 2019-08-01 11:47:30 +0800
• 124cce34b6 mp4录制全部替换mp4v2为media-server zqsong 2019-08-01 11:44:16 +0800
• 45b5da0977 恢复日志 xiongziliang 2019-07-31 17:51:53 +0800
• 7e92a0b738 MP4录制添加H265支持 zqsong 2019-07-30 21:29:31 +0800
• 360eba2c68 MP4录制添加H265支持 zqsong 2019-07-30 19:26:38 +0800
• fbf0469ef2 完善跨域支持 xiongziliang 2019-07-30 16:07:51 +0800
• 2068c873a5 完善跨域支持 xiongziliang 2019-07-30 16:07:00 +0800
• d01fc3a383 Merge remote-tracking branch 'origin/master' xiongziliang 2019-07-30 13:54:31 +0800
• 99ab975065 h265支持输入复合帧 拆帧代码复用 xiongziliang 2019-07-30 13:54:19 +0800
• 16db003434
  Merge pull request #2 from zlmediakit/master baiyfcu 2019-07-30 09:52:08 +0800
• 3efea46c5e 使用CMAKE_CURRENT_SOURCE_DIR代替CMAKE_SOURCE_DIR,方便嵌入其它cmake工程 baiyfcu 2019-07-30 09:49:29 +0800
• 1e3591becc
  Update README_CN.md 夏楚 2019-07-29 23:58:13 +0800
• 5457d73ecc
  Update README.md 夏楚 2019-07-29 23:57:30 +0800
• d507220869 Merge remote-tracking branch 'origin/master' xiongziliang 2019-07-29 23:54:49 +0800
• 5985ff4567 新增logo xiongziliang 2019-07-29 23:54:30 +0800
• e55108de4f
  Update README_CN.md 夏楚 2019-07-29 14:04:55 +0800
• e27e7bed4d 合并#57 xiongziliang 2019-07-28 20:55:37 +0800
• 20ca0f76cd 修复test_player windows编译错误 baiyfcu 2019-07-26 22:56:17 +0800
• 2d16e39445
  Merge pull request #1 from zlmediakit/master baiyfcu 2019-07-26 13:36:30 +0800
• 66dc9c43be 修复windows下编译问题 xiongziliang 2019-07-26 09:10:27 +0800
• 9640d8e33d 回复代码，防止兼容性问题 xiongziliang 2019-07-25 12:18:17 +0800
• 6922d82c65 rtmp解复用支持无内存拷贝 hls生成支持输入无0x 00 00 01的H264/H265数据 xiongziliang 2019-07-25 12:09:36 +0800
• d2a889b463 优化类命名以及添加注释 xiongziliang 2019-07-25 09:38:16 +0800
• 7baa35e594 修复hls由于缓存导致花屏的问题 xiongziliang 2019-07-24 18:40:18 +0800
• f50eaf8648 Frame添加cacheAbel接口 xiongziliang 2019-07-24 18:02:55 +0800
• 2d460ff83d 更新ZLToolKit(防止错误获取WorkThread中的线程) xiongziliang 2019-07-24 14:14:46 +0800
• 91747947b9 优化变量名 xiongziliang 2019-07-22 18:40:04 +0800
• cf4482983b 统一使用MultiMediaSourceMuxer转协议 xiongziliang 2019-07-22 18:37:32 +0800
• 46f5a853ac 适配最新代码 xiongziliang 2019-07-22 11:39:51 +0800
• bdf515561a 完善addStreamProxy接口注释 xiongziliang 2019-07-22 11:38:32 +0800
• 3ca699721e PlayerProxy、DevChannel、MultiMediaSourceMuxer类支持是否开启rtsp/rtmp功能 addStreamProxy增加enable_rtsp、enable_rtmp参数 xiongziliang 2019-07-22 11:27:17 +0800
• 3c8f96f2a1 添加rtsps rtmps客户端支持 xiongziliang 2019-07-20 20:53:50 +0800
• 1c89c60963 fixed #51 xiongziliang 2019-07-20 20:37:52 +0800
• ee8edb8ba8 完善注释 xiongziliang 2019-07-19 11:58:23 +0800
• 9c0fb9e676 添加配置项:是否直接rtsp拉流代理 xiongziliang 2019-07-19 11:54:29 +0800
• d71f1dd293 本协议拉流代码支持任意编码格式 xiongziliang 2019-07-19 11:30:39 +0800
• e095a604ab 更新ssrc生成规则 xiongziliang 2019-07-19 09:42:48 +0800
• 8bbd9d57c0 更改ssrc生成规则 xiongziliang 2019-07-17 15:23:54 +0800
• ff34b937f3 修复http头重复的bug xiongziliang 2019-07-17 14:54:14 +0800
• 917763c435 修复http头重复的bug xiongziliang 2019-07-17 14:50:24 +0800
• c0a6981662 修复android测试程序bug xiongziliang 2019-07-16 17:22:45 +0800
• 4122084e05 MP4点播绑定固定线程 xiongziliang 2019-07-11 14:51:40 +0800
• 7adddc361c 异步触发kBroadcastStreamNoneReader事件，修复#44 xiongziliang 2019-07-11 14:38:54 +0800
• 757139312b 完善注释 xiongziliang 2019-07-11 12:15:13 +0800
• d0d730985f 完善rtsp播放器推流udp端口创建机制 xiongziliang 2019-07-11 12:12:33 +0800
• 6518398aa5 修复某些rtsp服务器返回不规范导致兼容性问题 xiongziliang 2019-07-11 11:53:11 +0800
• 1df3859c98 修复异步addDelegate导致丢帧的问题 xiongziliang 2019-07-09 14:53:23 +0800
• 8092cb446e 修改on_stream_not_found接口 xiongziliang 2019-07-09 14:30:00 +0800
• aba16278dd 更新ZLToolKit(优化特定情况下的秒开速度) xiongziliang 2019-07-09 11:29:04 +0800
• 5dce8eccde 精简代码 xiongziliang 2019-07-03 16:42:20 +0800
• e36194aec3 完善对pts的支持 xiongziliang 2019-07-03 16:22:12 +0800
• f6ff2172bd 更新ZLToolKit（优化环形缓存逻辑） xiongziliang 2019-07-02 09:50:08 +0800
• 04197e1c4e 更新ZLToolKit（优化秒开） xiongziliang 2019-07-01 22:45:51 +0800
• 818d26aa66 添加onRedirectUrl事件 xiongziliang 2019-07-01 20:55:31 +0800
• ed78f152ee Http client 302错误码支持 xiongziliang 2019-07-01 18:35:26 +0800
• 339fdf0de4 Http client 302跳转 xiongziliang 2019-07-01 17:48:09 +0800
• 3c91bf1351 Http client支持302跳转 xiongziliang 2019-07-01 17:39:16 +0800
• 67f7c3dc8f http客户端支持302跳转 修复HttpRequestSplitter可能内存越界的bug xiongziliang 2019-07-01 09:53:58 +0800
• 7aa0c2ae33 整理优化代码 xiongziliang 2019-06-28 17:37:11 +0800
• 0b08831f5d 整理优化代码 xiongziliang 2019-06-28 17:30:13 +0800
• ea131d9740 整理优化代码 xiongziliang 2019-06-28 17:25:53 +0800
• 27ce8a9915 整理优化代码 xiongziliang 2019-06-28 16:55:28 +0800
• bf39cf3e33 整理优化代码 xiongziliang 2019-06-28 16:48:02 +0800
• 3e84142366 Merge remote-tracking branch 'origin/master' xiongziliang 2019-06-28 16:14:53 +0800
• 0a2c022fa8 优化代码 xiongziliang 2019-06-28 16:12:39 +0800
• ac356319b8
  Update README.md 夏楚 2019-06-27 14:00:36 +0800
• 034dbbf7ba 修复rtp打洞包相关的bug xiongziliang 2019-06-27 12:53:35 +0800
• 585201ece1 修复接收rtsp推流的兼容性问题 xiongziliang 2019-06-27 12:21:01 +0800
• 1a3afcee40 Merge remote-tracking branch 'origin/master' xiongziliang 2019-06-26 10:01:16 +0800
• d250e1b7ec 整理代码 xiongziliang 2019-06-26 10:01:04 +0800
• b4a07c028f
  Update README.md 夏楚 2019-06-26 09:33:11 +0800
• 33e7113e9f Merge remote-tracking branch 'origin/master' xiongziliang 2019-06-26 09:30:02 +0800
• d66c5971aa 更新ZLToolK(修复在onRead事件中设置读缓存的bug) xiongziliang 2019-06-26 09:24:20 +0800
• 0af676c32b
  Update README.md 夏楚 2019-06-25 18:52:12 +0800
• 7a03147d75
  Update README.md 夏楚 2019-06-25 18:50:01 +0800
• 57b8772cb9
  Update README.md 夏楚 2019-06-25 18:49:18 +0800
• 538536864a add english readme xiongziliang 2019-06-25 18:47:09 +0800
• d3efca2930 add english readme xiongziliang 2019-06-25 18:46:47 +0800
• 18a0691448 优化代码 xiongziliang 2019-06-24 17:01:15 +0800
• 85f05adc06 优化代码，提升可读性 xiongziliang 2019-06-24 16:56:46 +0800
• fec7fe5b3b 更新ZLToolK xiongziliang 2019-06-24 16:08:06 +0800
• 9039f8c1f6 支持超大rtp包 xiongziliang 2019-06-24 16:07:44 +0800
• cc7b19dedc 更新ZLToolK(修复windows下sendto相关问题) xiongziliang 2019-06-24 15:34:57 +0800
• bff1f2f8f6 函数声明放置于头文件 xiongziliang 2019-06-24 14:58:56 +0800
• 9a5d3da69c 修复linux编译失败的问题 xiongziliang 2019-06-24 14:57:12 +0800
• 99dda48bf7 FFmpeg超时时间与hook超时时间关联 xiongziliang 2019-06-24 14:51:49 +0800
• 276aa1a497 FFmpeg禁止生产core文件 xiongziliang 2019-06-24 14:50:50 +0800
• e26056617b 更新ZLToolK xiongziliang 2019-06-24 09:22:19 +0800
• c1069f2482 更新ZLToolK(修复定时器相关bug) xiongziliang 2019-06-21 11:30:03 +0800