3893 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Xiaofeng Wang	25e9cd07db	避免其他模块查找过程污染基础环境 ... Close https://github.com/ZLMediaKit/ZLMediaKit/issues/1840	2022-07-30 11:26:48 +08:00
Xiaofeng Wang	d9d33b8522	Merge pull request #1842 from wasphin/feature/apple-m1 ... Fix build on apple M1	2022-07-29 19:59:07 +08:00
Xiaofeng Wang	be3cc33800	Fix build on apple M1	2022-07-29 19:37:51 +08:00
ziyue	bdd83cf61a	cpp测试程序添加必要编译宏	2022-07-29 18:14:10 +08:00
ziyue	afcf247464	完善mpegts/ps容器对aac音频的兼容: #1801	2022-07-29 18:05:16 +08:00
ziyue	ace989d378	完善rtp server日志打印	2022-07-29 17:57:52 +08:00
ziyue	24db0454a8	不支持的协议直接抛异常, 防止非法推拉流：#1725	2022-07-29 17:32:30 +08:00
ziyue	54f400a6e9	确保MediaServer主函数可以多次调用: #1838	2022-07-29 16:24:43 +08:00
ziyue	3cb0f66093	修复Android ci编译问题	2022-07-29 16:07:04 +08:00
ziyue	5babe63cdb	修复Windows编译问题	2022-07-29 15:47:06 +08:00
ziyue	7d8b212a3c	修复rtmp汇报窗口太小导致循环递归的bug：#1839	2022-07-29 12:02:00 +08:00
Xiaofeng Wang	9ea98642c1	Merge pull request #1837 from wasphin/feature/cmake-fix-sctp ... 修正启用 SCTP 后编译问题	2022-07-29 08:05:14 +08:00
Xiaofeng Wang	b1ccbcc4ae	Linux CI 中开启 SCTP	2022-07-28 23:18:23 +08:00
Xiaofeng Wang	c14a777598	修正启用 SCTP 后编译问题	2022-07-28 23:15:22 +08:00
夏楚	d0f0c69f93	Merge pull request #1836 from CharleyWangHZ/master ... Update MediaSource.h	2022-07-28 19:57:16 +08:00
CharleyWangHZ	2685f3cdc2	Update MediaSource.h	2022-07-28 16:43:03 +08:00
夏楚	76df34de81	Merge pull request #1825 from wasphin/feature/cmake ... 整理 CMakeLists.txt	2022-07-28 14:27:44 +08:00
夏楚	6fd207118a	Merge pull request #1829 from dcan123/master ... 新增rtp udp收流增加丢包率	2022-07-28 14:17:18 +08:00
Xiaofeng Wang	8cb73e1bc3	修正 Windows 编译问题	2022-07-28 00:25:50 +08:00
dingcan	23e0abde04	Update RtpProcess.cpp	2022-07-27 14:13:54 +08:00
dingcan	0a678661e3	Update RtpProcess.cpp	2022-07-27 10:02:15 +08:00
dingcan	532932fd2d	Update RtpProcess.h	2022-07-26 14:44:32 +08:00
dingcan	b8d17565d7	修改代码格式	2022-07-26 14:42:42 +08:00
Xiaofeng Wang	310b60276c	cmake: try to disable compile warning of C4819	2022-07-26 13:25:36 +08:00
Xiaofeng Wang	8f679831bc	camke: fix server compile definitions	2022-07-26 13:23:58 +08:00
Xiaofeng Wang	a35134a5ca	cmake: fix version.h path	2022-07-26 13:09:25 +08:00
dingcan	c1b4ccd041	Update RtpProcess.cpp	2022-07-26 11:57:09 +08:00
dingcan	ed6c80cf07	新增rtp udp收流增加丢包率	2022-07-26 11:21:19 +08:00
Xiaofeng Wang	0fb0cc29e5	设置依赖以便推导编译依赖	2022-07-26 00:17:59 +08:00
Xiaofeng Wang	ac378eaaf1	使用统一的编译参数	2022-07-26 00:11:31 +08:00
Xiaofeng Wang	0fc38bbadb	避免对外传递 srtp 依赖	2022-07-26 00:04:03 +08:00
Xiaofeng Wang	388bf71813	Fix finding mmsghdr	2022-07-25 23:49:38 +08:00
Xiaofeng Wang	0b33769ee9	cmake: 库列表名称变更	2022-07-25 23:44:02 +08:00
Xiaofeng Wang	d850846612	cmake: 检查 target 来确认功能是否已启用	2022-07-25 13:52:26 +08:00
夏楚	e7cb05d3b4	Merge pull request #1822 from Dw9/master ... c api支持从mp4推送rtp	2022-07-25 10:33:29 +08:00
Xiaofeng Wang	9d3ead61de	整理 CMakeLists.txt	2022-07-25 00:22:30 +08:00
Xiaofeng Wang	8192b37cd4	修正 ENABLE_RTPPROXY 的处理	2022-07-24 22:30:59 +08:00
Dw9	40099df3c0	c api支持从mp4推送rtp	2022-07-24 08:51:11 +08:00
ziyue	0f47abd3ac	更新zltoolkit	2022-07-22 16:25:29 +08:00
ziyue	ec7fe5cc9a	整理frame相关代码，完善FrameStamp重载函数	2022-07-22 16:20:47 +08:00
夏楚	7b3968d949	Merge pull request #1809 from Dw9/master ... 完善test_player	2022-07-19 11:15:41 +08:00
Dw9	8e63b7fefa	完善test_player	2022-07-18 22:30:28 +08:00
ziyue	305722e5d6	docker开启ffmpeg相关功能	2022-07-18 16:54:38 +08:00
ziyue	44d9d04053	新增代码分析ci	2022-07-18 16:54:20 +08:00
ziyue	5a9c6c7460	linux ci 开启FFmpeg相关功能	2022-07-18 16:54:03 +08:00
ziyue	b19574cea7	防止内存越界	2022-07-18 15:41:18 +08:00
夏楚	d703ec29c6	Merge pull request #1805 from ZLMediaKit/feature/fix_rtsp_player_pt_error ... Feature/fix rtsp player pt error	2022-07-18 11:25:16 +08:00
xiongguangjie	b53ad2cc2d	for rtsp sdp pt more check	2022-07-17 00:30:12 +08:00
xiongguangjie	3eaf7897a7	rtsp player trust sdp pt ,ingore other pt compatible hik nvr record	2022-07-17 00:26:07 +08:00
xiongguangjie	7db7d5bec0	Merge pull request #1803 from custompal/cus_pr ... getMp4RecordFile接口可使用自定义的录像保存根目录来搜索文件	2022-07-15 21:20:18 +08:00