夏楚
|
8efb2da572
|
Update config.ini
|
2020-12-19 09:16:04 +08:00 |
|
夏楚
|
a60cf0b9a4
|
Merge pull request #635 from mirsfang/master
fix disable hls and rtpproxy compile error
|
2020-12-19 09:14:48 +08:00 |
|
夏楚
|
1b2cb57ad8
|
Merge pull request #633 from wasphin/feature/package-rpm
添加 RPM 打包支持
|
2020-12-19 09:14:22 +08:00 |
|
mirs
|
6c853008fc
|
fix disable hls and rtpproxy compile error
|
2020-12-18 18:32:12 +08:00 |
|
wxf
|
e467cf10c3
|
修正 rpm 包依赖配置
|
2020-12-18 09:12:57 +08:00 |
|
wxf
|
6a2709bec2
|
需要 cmake3
|
2020-12-17 21:40:58 +08:00 |
|
wxf
|
2242f7ecc5
|
修正 CentOS 6 下使用 devtoolset 8 编译问题
使用 inttypes.h 提供的 PRIu64 需要定义 __STDC_FORMAT_MACROS,
而 cinttypes 会定义该宏.
https://stackoverflow.com/a/8132440/5218590
|
2020-12-17 20:47:31 +08:00 |
|
wxf
|
af6446507e
|
添加编译开关
|
2020-12-17 20:25:54 +08:00 |
|
wxf
|
acc5ecb937
|
添加 rpm spec
|
2020-12-17 19:45:43 +08:00 |
|
wxf
|
9a05c2be4d
|
调整 linux 下安装位置
|
2020-12-17 19:43:17 +08:00 |
|
xiongziliang
|
8b134d5b2d
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into open_src
|
2020-12-13 09:56:26 +08:00 |
|
xiongziliang
|
1397399589
|
更新zltoolkit
|
2020-12-13 09:52:16 +08:00 |
|
xiongziliang
|
f1c9b7b09c
|
修复播放器线程安全问题:#611
|
2020-12-13 09:52:00 +08:00 |
|
xiongziliang
|
b7d1a5059a
|
提高rtmp协议兼容性
|
2020-12-13 09:51:08 +08:00 |
|
ziyue
|
8b2fb0bc1f
|
修复Linux下编译问题
|
2020-12-06 22:36:44 +08:00 |
|
ziyue
|
c0a4170086
|
优化http api相关代码,方便自由添加不同类型的api
|
2020-12-06 21:50:41 +08:00 |
|
ziyue
|
dc3701e6cc
|
修复rtp存在ext时无法解析的bug:#585
|
2020-12-06 21:08:16 +08:00 |
|
ziyue
|
43164d3670
|
Merge remote-tracking branch 'origin/master'
|
2020-12-07 10:24:28 +08:00 |
|
xiongziliang
|
b90ebf6511
|
合并pr:#607
|
2020-12-05 12:31:28 +08:00 |
|
夏楚
|
955ecde533
|
Merge pull request #607 from alongL/master
Update HttpTSPlayer.cpp
|
2020-12-05 12:29:20 +08:00 |
|
xiongziliang
|
3f37ef618d
|
删除文件太小的录像
|
2020-12-05 12:25:52 +08:00 |
|
xiongziliang
|
55cf411c1e
|
支持bitrate
|
2020-12-05 12:22:17 +08:00 |
|
ziyue
|
68926b4ae7
|
支持bitrate
|
2020-12-04 16:44:53 +08:00 |
|
along
|
7131649779
|
Update HttpTSPlayer.cpp
保存http status返回值,在非200或206的情况下,不再进行数据判断。
|
2020-12-03 10:23:46 +08:00 |
|
xiongziliang
|
42679cdf98
|
更新第三方库,提升GB28281推流兼容性
|
2020-11-29 09:42:16 +08:00 |
|
xiongziliang
|
a64ce68592
|
解决单Track时,等待时间太长的问题
|
2020-11-29 09:38:04 +08:00 |
|
xiongziliang
|
a5b4da7db5
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into open_src
|
2020-11-29 09:36:12 +08:00 |
|
xiongziliang
|
c4c978be44
|
去除编译警告
|
2020-11-29 09:34:02 +08:00 |
|
xiongziliang
|
e7569c8cbc
|
删除多余日志
|
2020-11-29 09:33:49 +08:00 |
|
夏楚
|
5f01eb7f73
|
Merge pull request #599 from sunhui2013/master
解决RtpServer启动UDPServer收流造成崩溃问题
|
2020-11-29 09:27:58 +08:00 |
|
sunhui
|
48788cf25b
|
解决RtpServer启动UDPServer收流造成崩溃问题
|
2020-11-28 02:39:21 +08:00 |
|
kingyuanyuan
|
62130f77e6
|
!1 多路RTP 流输出
Merge pull request !1 from kingyuanyuan/branch
|
2020-11-27 17:26:52 +08:00 |
|
hewenyuan
|
50927548e9
|
增加多路RTP视频流输出
|
2020-11-27 17:19:55 +08:00 |
|
xiongziliang
|
f7433b0f90
|
头文件中隐藏不必要的宏,避免宏蔓延:#554
|
2020-11-21 22:39:32 +08:00 |
|
xiongziliang
|
408a678ade
|
修复编译问题:#584
|
2020-11-21 22:32:01 +08:00 |
|
xiongziliang
|
751f42fe1e
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into open_src
|
2020-11-21 22:17:36 +08:00 |
|
xiongziliang
|
9c585ce5a1
|
http客户端,host字段添加port,防止异常:#579
|
2020-11-21 22:16:58 +08:00 |
|
xiongziliang
|
f05422bb65
|
c api支持国标推流:#578
|
2020-11-21 22:13:08 +08:00 |
|
xiongziliang
|
c512c1a02e
|
关闭vhost时,m3u8中ts文件不指定vhost:#560
|
2020-11-21 21:54:12 +08:00 |
|
夏楚
|
e89459a935
|
修正错误
|
2020-11-16 11:46:04 +08:00 |
|
xiongziliang
|
1cc3add97f
|
提升按需转协议性能与体验
|
2020-11-15 00:59:31 +08:00 |
|
xiongziliang
|
0f54351811
|
按需转协议默认关闭(意即一直转协议)
|
2020-11-15 00:43:42 +08:00 |
|
xiongziliang
|
bb9b39d821
|
添加按需转协议开关,默认一直转协议:#569
|
2020-11-15 00:40:46 +08:00 |
|
xiongziliang
|
ebbe124d00
|
修复不能立即关闭拉流代理的问题:#559
|
2020-11-15 00:00:22 +08:00 |
|
xiongziliang
|
3d8f015f5d
|
GB28181推流,无人观看时不解复用数据
|
2020-11-14 23:11:28 +08:00 |
|
xiongziliang
|
6c8f1c9403
|
更新ZLToolKit,修复bug: #558
|
2020-11-08 21:42:36 +08:00 |
|
xiongziliang
|
9618748c65
|
默认hook地址置空,方便关闭hook
同时整理简化代码
|
2020-11-08 09:28:46 +08:00 |
|
xiongziliang
|
a93c57eb59
|
修复ehome推流相关bug: #549
|
2020-11-07 17:46:37 +08:00 |
|
xiongziliang
|
57a11f19dd
|
提高rtsp兼容性: #551
|
2020-11-07 17:45:58 +08:00 |
|
xiongziliang
|
ba7251f345
|
修复偶尔获取H265宽高失败的问题
|
2020-11-07 17:45:16 +08:00 |
|