3186 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
xiongziliang	7c7b9e560e	统一添加bom	2019-08-08 19:01:45 +08:00
xiongziliang	ef61c56cc2	优化hls生成	2019-08-07 18:24:08 +08:00
xiongziliang	4480dad36f	修正错误	2019-08-06 22:56:09 +08:00
xiongziliang	b70d6cd2c2	支持修正时间戳	2019-08-06 22:54:37 +08:00
xiongziliang	749fb98439	更新ZLToolKit（日志分天以及清理）	2019-08-06 22:52:19 +08:00
xiongziliang	0007734bbb	支持日志分天以及自动清理	2019-08-06 22:51:40 +08:00
xiongziliang	2020e23437	兼容某些不规范的sdp	2019-08-06 16:23:20 +08:00
xiongziliang	008df0ab85	去除继承	2019-08-04 23:58:54 +08:00
xiongziliang	462eac9aea	更新ZLToolKit(优化windows下线程切换)	2019-08-04 23:16:05 +08:00
xiongziliang	f9426c2cfb	尝试修复时间戳回环或乱序导致的问题	2019-08-02 18:06:37 +08:00
xiongziliang	6a9eb8d54b	尝试修复时间戳回环或乱序导致的问题	2019-08-02 17:33:31 +08:00
xiongziliang	36803ccedc	Merge remote-tracking branch 'origin/master' into zqsong	2019-08-02 13:51:34 +08:00
xiongziliang	36ed78ba1f	规范函数命名	2019-08-02 13:51:24 +08:00
xiongziliang	dd80d6a6bb	Merge branch 'dev' of https://github.com/zqsong/ZLMediaKit into zqsong	2019-08-02 13:40:15 +08:00
xiongziliang	892734bfd8	完善	2019-08-02 11:54:05 +08:00
xiongziliang	a400b39fab	修复可能丢帧的bug	2019-08-02 11:09:17 +08:00
xiongziliang	35c324b6b4	修复首帧不是I帧 导致花屏的问题	2019-08-02 10:53:00 +08:00
zqsong	0d57664fac	完善H265 sps解析,统一命名风格	2019-08-02 10:46:16 +08:00
xiongziliang	0980bde12d	mp4录制支持h265	2019-08-01 22:32:04 +08:00
夏楚	d3d7fe1bd1	mp4录制支持H265	2019-08-01 22:28:47 +08:00
xiongziliang	4d215a8e2b	还原代码	2019-08-01 22:21:55 +08:00
xiongziliang	1f89019818	写mp4文件缓存可配置	2019-08-01 22:13:26 +08:00
xiongziliang	13a6d3ac16	完善写mp4文件	2019-08-01 22:07:40 +08:00
xiongziliang	6c0d89f417	修复生成mp4相关bug	2019-08-01 21:59:26 +08:00
xiongziliang	6d8db7d232	修复bug	2019-08-01 19:09:14 +08:00
xiongziliang	383a14a76d	重新mp4录制	2019-08-01 18:49:04 +08:00
xiongziliang	12e1068a39	Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit into zqsong	2019-08-01 14:53:59 +08:00
xiongziliang	e13ae419ae	精简H264Frame对象，删除多余字段	2019-08-01 14:39:09 +08:00
xiongziliang	69098612bc	Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit into zqsong	2019-08-01 14:06:34 +08:00
baiyfcu	ad83b39b0f	Merge pull request #3 from zlmediakit/master ... update	2019-08-01 13:27:56 +08:00
xiongziliang	2e95c3b2fa	修改Rtmp播放结果回调事件触发机制，防止秒开失败以及获取Track失败	2019-08-01 13:12:24 +08:00
xiongziliang	fcdcf12af9	更新ZLToolKit 修好GOP缓存不够导致秒开失败的bug	2019-08-01 13:06:54 +08:00
zqsong	776dd4c085	恢复CMakeLists.txt	2019-08-01 11:47:30 +08:00
zqsong	124cce34b6	mp4录制全部替换mp4v2为media-server	2019-08-01 11:44:16 +08:00
xiongziliang	45b5da0977	恢复日志	2019-07-31 17:51:53 +08:00
zqsong	7e92a0b738	MP4录制添加H265支持	2019-07-30 21:29:31 +08:00
zqsong	360eba2c68	MP4录制添加H265支持	2019-07-30 19:26:38 +08:00
xiongziliang	fbf0469ef2	完善跨域支持	2019-07-30 16:07:51 +08:00
xiongziliang	2068c873a5	完善跨域支持	2019-07-30 16:07:00 +08:00
xiongziliang	d01fc3a383	Merge remote-tracking branch 'origin/master'	2019-07-30 13:54:31 +08:00
xiongziliang	99ab975065	h265支持输入复合帧 拆帧代码复用	2019-07-30 13:54:19 +08:00
baiyfcu	16db003434	Merge pull request #2 from zlmediakit/master ... update	2019-07-30 09:52:08 +08:00
baiyfcu	3efea46c5e	使用CMAKE_CURRENT_SOURCE_DIR代替CMAKE_SOURCE_DIR,方便嵌入其它cmake工程	2019-07-30 09:49:29 +08:00
夏楚	1e3591becc	Update README_CN.md	2019-07-29 23:58:13 +08:00
夏楚	5457d73ecc	Update README.md	2019-07-29 23:57:30 +08:00
xiongziliang	d507220869	Merge remote-tracking branch 'origin/master'	2019-07-29 23:54:49 +08:00
xiongziliang	5985ff4567	新增logo	2019-07-29 23:54:30 +08:00
夏楚	e55108de4f	Update README_CN.md	2019-07-29 14:04:55 +08:00
xiongziliang	e27e7bed4d	合并#57	2019-07-28 20:55:37 +08:00
baiyfcu	20ca0f76cd	修复test_player windows编译错误	2019-07-26 22:56:17 +08:00