3665 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ziyue	81c5f5030a	新增作者	2021-07-01 11:03:28 +08:00
ziyue	1dd88fceaa	Merge branch 'master' of https://github.com/lawrencehj/ZLMediaKit	2021-07-01 11:02:17 +08:00
ziyue	1485be266a	查找MediaSource时，app与stream id不能为空	2021-07-01 10:56:59 +08:00
lawrencehj	f1d89b5297	修正Windows下宏替换编译错误问题	2021-07-01 10:39:28 +08:00
xiongziliang	09fa6b7aae	精简代码	2021-06-30 23:35:19 +08:00
xiongziliang	c470016316	优化MediaSource遍历性能	2021-06-30 23:03:27 +08:00
ziyue	69c3b24d06	优化遍历MediaSource接口性能	2021-06-30 21:24:16 +08:00
ziyue	4ec311652a	未找到依赖库时，关闭编译test_player	2021-06-29 18:37:09 +08:00
ziyue	ebb7aeef9b	播放器沿用之前名称	2021-06-29 18:26:03 +08:00
ziyue	d8f75aee55	新增作者	2021-06-29 18:20:18 +08:00
ziyue	11e993d870	修改接口	2021-06-29 18:19:05 +08:00
ziyue	013109796d	确保线程安全	2021-06-29 17:53:26 +08:00
ziyue	1b674a6ac2	播放器新增支持音频:#945	2021-06-29 17:47:01 +08:00
ziyue	66f28f52b4	添加Ptr定义	2021-06-29 17:42:32 +08:00
ziyue	df377fc1f4	修改宏定义，防止频繁重新全量编译	2021-06-29 17:41:56 +08:00
ziyue	509930ff0a	Merge branch 'master' of https://github.com/DoubleX69/ZLMediaKit	2021-06-29 11:50:24 +08:00
ziyue	3165a2f81c	修改服务器版本信息声明相关代码	2021-06-29 11:16:05 +08:00
ziyue	dfbfd65ab3	宏定义移至macros.h文件	2021-06-28 20:29:56 +08:00
ziyue	de5cf86050	http最大请求加大到40 KB	2021-06-28 20:12:35 +08:00
ziyue	397c1c7c57	整理宏	2021-06-28 20:12:07 +08:00
DoubleX69	d4b3036446	add：增加Audio子目录及对应的库	2021-06-28 17:51:58 +08:00
DoubleX69	0263bb9b50	修改提示信息	2021-06-28 17:51:08 +08:00
DoubleX69	4edb015d2d	add: 增加AudioPlayer播放音频	2021-06-28 17:34:07 +08:00
DoubleX69	5ac4e3cc72	add: 增加Audio相关代码	2021-06-28 17:33:26 +08:00
ziyue	7e5873d818	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit	2021-06-28 16:29:50 +08:00
ziyue	ded38fc3f6	Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit	2021-06-28 16:03:20 +08:00
ziyue	48d82daa5c	添加bom头	2021-06-28 16:02:13 +08:00
Xiaofeng Wang	42d2c1b4c0	Merge pull request #941 from ZLMediaKit/feature/fix-cmake-prepend ... Revert "调整链接顺序, 修正编译问题"	2021-06-28 14:03:44 +08:00
Xiaofeng Wang	e1be491d4c	Merge pull request #940 from ZLMediaKit/feature/fix-cmake-prepend ... Revert "调整链接顺序, 修正编译问题"	2021-06-28 14:03:33 +08:00
xgj	f06faa7c02	cmake list PREPEND only from 3.15 support use append linux use link group solve link order error	2021-06-28 13:56:12 +08:00
wxf	8cf58dd843	Revert "调整链接顺序, 修正编译问题" ... This reverts commit a92b02907d.	2021-06-28 13:53:28 +08:00
ziyue	cd7af6fa4e	update	2021-06-28 11:31:11 +08:00
ziyue	89fb4222ce	默认关闭编译webrtc	2021-06-28 10:46:03 +08:00
ziyue	8f730b8dab	整理代码	2021-06-28 10:36:50 +08:00
ziyue	430229fe94	Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev_test	2021-06-28 10:11:39 +08:00
ziyue	02bd01c83b	完善http option命令	2021-06-28 10:10:09 +08:00
夏楚	fae86a9b4b	!11 合帧逻辑 加强判断，防止 SPS PPS VPS 作为一帧，rtmp h264/h265 打包 保证帧内必须有VCL ... Merge pull request !11 from xiongguangjie/dev	2021-06-28 02:02:49 +00:00
xiongziliang	3f36a10bee	Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev	2021-06-26 18:28:31 +08:00
夏楚	d3f81745fd	Merge pull request #936 from ZLMediaKit/feature/fix-workflow ... 支持编译 WebRTC	2021-06-26 18:16:45 +08:00
夏楚	c733e7af41	Merge pull request #935 from ZLMediaKit/feature/fix-compile ... 调整链接顺序, 修正编译问题	2021-06-26 18:16:05 +08:00
wxf	72e8b6efa4	支持集成 WebRTC 功能	2021-06-26 18:07:26 +08:00
wxf	0a7acf94d3	明确使用的编译服务器版本	2021-06-26 17:57:05 +08:00
wxf	b026634a3e	未启用 WebRTC 的情况下禁用相关测试用例	2021-06-26 17:10:42 +08:00
wxf	a92b02907d	调整链接顺序, 修正编译问题 ... webrtc 依赖于 zlmediakit	2021-06-26 16:56:56 +08:00
夏楚	4609716ba3	Merge pull request #933 from CharleyWangHZ/master	2021-06-26 03:55:17 +08:00
xiongguangjie	c0f362af33	for linux compile --start-group and --end-group	2021-06-25 22:03:52 +08:00
xiongguangjie	6d8d64caf6	for mergen	2021-06-25 21:24:53 +08:00
ziyue	8c670c652e	提前映射ssrc与rid的关系	2021-06-25 18:18:48 +08:00
ziyue	0f1d1ded7e	rid支持更新	2021-06-25 18:08:03 +08:00
ziyue	365aead8b6	修复注释	2021-06-25 17:24:32 +08:00