16 Commits

Author	SHA1	Message	Date
xiongziliang	10afab77f3	Merge branch 'feature/keep_alive_monk' of https://gitee.com/xia-chu/ZLMediaKit	2021-08-21 19:11:20 +08:00
ziyue	1b4f5313f2	修复异步http api相关bug	2021-08-18 20:37:10 +08:00
ziyue	4dbe0a1d3e	合并pr：#1025	2021-08-12 20:37:46 +08:00
baiyfcu	0ed902509a	player增加speed，pause扩展，seek支持秒级定位，MP4按时间戳生成文件	2021-08-09 18:28:43 +08:00
xia-chu	38894097ae	Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev	2021-04-09 10:47:14 +08:00
xia-chu	67e1b1f194	媒体注册hook添加编码等信息	2021-04-08 17:34:46 +08:00
ziyue	7e5cb33395	开始对接js	2021-03-31 17:15:26 +08:00
xia-chu	b6cbc87712	全面整理代码，去除编译警告	2021-01-17 18:31:50 +08:00
xiongziliang	f9f9cde2b4	整理webapi、webhook框架代码	2020-12-27 22:14:59 +08:00
xiongziliang	7019e4717c	整理授权协议	2020-04-04 20:30:09 +08:00
xiongziliang	35c4c05e7b	修复setServerConfig接口保存配置文件相关bug	2019-11-04 09:21:11 +08:00
xiongziliang	7c7b9e560e	统一添加bom	2019-08-08 19:01:45 +08:00
xiongziliang	bff1f2f8f6	函数声明放置于头文件	2019-06-24 14:58:56 +08:00
xiongziliang	e1e50191fb	配置键名统一使用string	2019-06-19 10:32:54 +08:00
xiongziliang	4bd6b24c30	添加协议头	2019-06-11 09:25:54 +08:00
xiongziliang	c503749328	添加FFmpeg拉流功能	2019-06-06 18:28:33 +08:00