baiyfcu
|
7490f320f8
|
Merge pull request #15 from xiongziliang/master
update
|
2020-04-26 22:35:29 +08:00 |
|
xiongziliang
|
7272f01ea9
|
确保能同步取消定时器
|
2020-04-26 19:36:17 +08:00 |
|
xiongziliang
|
341bb5d84a
|
确保定时器能同步取消
|
2020-04-26 19:34:58 +08:00 |
|
xiongziliang
|
3651609a5f
|
确保mk_player_release后不再触发回调
|
2020-04-26 19:09:38 +08:00 |
|
xiongziliang
|
ff7cf5f4d3
|
完善注释
|
2020-04-26 19:04:47 +08:00 |
|
xiongziliang
|
dee0af1c40
|
Merge remote-tracking branch 'origin/master'
|
2020-04-26 19:02:49 +08:00 |
|
xiongziliang
|
e141eeb8b8
|
同步取消回调
|
2020-04-26 19:02:40 +08:00 |
|
baiyfcu
|
98d0bc27f9
|
mk_player api 增加seek和获取进度以相对开始时间的接口以适应按时间轴方式回放的需求
|
2020-04-26 17:40:34 +08:00 |
|
夏楚
|
42b89a4da1
|
Update README.md
|
2020-04-26 17:40:09 +08:00 |
|
baiyfcu
|
12eabbe426
|
Merge pull request #14 from xiongziliang/master
update
|
2020-04-26 15:30:28 +08:00 |
|
xiongziliang
|
75cc34814f
|
保证不丢帧
|
2020-04-26 15:19:32 +08:00 |
|
xiongziliang
|
b2fe3cd05d
|
加锁
|
2020-04-26 11:25:25 +08:00 |
|
xiongziliang
|
2c9141513d
|
ts/ps支持G711
|
2020-04-26 09:45:00 +08:00 |
|
xiongziliang
|
b2b276029b
|
修复windows下编译问题
|
2020-04-24 16:35:41 +08:00 |
|
xiongziliang
|
f222af2632
|
完善代码
|
2020-04-24 15:28:27 +08:00 |
|
xiongziliang
|
e85a8f277e
|
RTMP协议限制G711规格、日志打印codec相关信息
|
2020-04-24 15:08:28 +08:00 |
|
xiongziliang
|
46740b7c31
|
修复编译问题
|
2020-04-24 14:13:50 +08:00 |
|
xiongziliang
|
bda57b57f2
|
修复内存失效的问题
|
2020-04-24 14:06:28 +08:00 |
|
xiongziliang
|
2e74d5c957
|
修复合并写相关bug: #282
|
2020-04-24 13:51:04 +08:00 |
|
xiongziliang
|
3cdc0dd98f
|
更新ZLToolKit
|
2020-04-24 12:45:21 +08:00 |
|
xiongziliang
|
79949fc05f
|
Merge remote-tracking branch 'origin/master'
|
2020-04-24 12:39:34 +08:00 |
|
xiongziliang
|
b4228f91c3
|
适配ZLToolKit
|
2020-04-24 12:39:22 +08:00 |
|
夏楚
|
540faa8c24
|
Update README_en.md
|
2020-04-24 10:12:21 +08:00 |
|
夏楚
|
48e6fecbc0
|
Update README.md
|
2020-04-24 10:11:45 +08:00 |
|
xiongziliang
|
a9fcd9dbc1
|
完善接口
|
2020-04-23 23:57:42 +08:00 |
|
xiongziliang
|
787af5109e
|
api返回音视频相关信息
|
2020-04-23 23:45:20 +08:00 |
|
xiongziliang
|
1c03acbdb9
|
完善网络相关信息
|
2020-04-23 23:33:58 +08:00 |
|
xiongziliang
|
26cfb5ae73
|
完善网络相关信息
|
2020-04-23 23:30:24 +08:00 |
|
xiongziliang
|
0df25942aa
|
rtp推流初步添加事件
|
2020-04-23 23:18:24 +08:00 |
|
xiongziliang
|
00c21cd99e
|
优化代码
|
2020-04-23 22:22:24 +08:00 |
|
xiongziliang
|
eda7a59f3c
|
统一事件参数类型
|
2020-04-23 22:04:59 +08:00 |
|
xiongziliang
|
b6946a5968
|
事件广播触发者改成SockInfo对象
|
2020-04-23 21:38:44 +08:00 |
|
xiongziliang
|
4d84661a87
|
更新ZLToolKit
|
2020-04-23 17:50:12 +08:00 |
|
xiongziliang
|
b09919d374
|
替换inet_ntoa线程安全版本
|
2020-04-23 16:14:24 +08:00 |
|
xiongziliang
|
727322b8e9
|
更新readme
|
2020-04-23 15:51:11 +08:00 |
|
xiongziliang
|
b2e324efdc
|
完善日志
|
2020-04-23 15:43:22 +08:00 |
|
xiongziliang
|
2e3cee09bb
|
hls/mp4录像/mp4点播/ts解析/ps解析初步支持G711
|
2020-04-23 15:19:20 +08:00 |
|
xiongziliang
|
eb67bc8348
|
完善测试程序
|
2020-04-22 09:55:24 +08:00 |
|
xiongziliang
|
8859e89ade
|
完善 c api
|
2020-04-22 09:51:04 +08:00 |
|
xiongziliang
|
1d5c6cb141
|
整理解析器
|
2020-04-20 18:13:45 +08:00 |
|
baiyfcu
|
7805558d3a
|
Merge pull request #13 from xiongziliang/master
update
|
2020-04-20 09:16:08 +08:00 |
|
xiongziliang
|
003cd58371
|
完善接口
|
2020-04-19 00:05:02 +08:00 |
|
xiongziliang
|
b7b839a06f
|
修复编译错误
|
2020-04-18 23:58:29 +08:00 |
|
xiongziliang
|
49596bd97f
|
简化接口
|
2020-04-18 23:56:27 +08:00 |
|
xiongziliang
|
e1459834df
|
支持G711编码
|
2020-04-18 23:06:36 +08:00 |
|
xiongziliang
|
3efda8fd0b
|
根据playload type生成track
|
2020-04-18 23:00:48 +08:00 |
|
xiongziliang
|
bacf8f100b
|
G711支持多种规格
|
2020-04-18 22:13:11 +08:00 |
|
xiongziliang
|
5c3418a412
|
合并 #278
|
2020-04-18 18:46:20 +08:00 |
|
xiongziliang
|
1f43359b31
|
Merge branch 'master' of https://github.com/baiyfcu/ZLMediaKit
|
2020-04-18 16:05:49 +08:00 |
|
baiyfcu
|
40afa204d5
|
增加rtmp/rtsp对音频G711A,G711U的支持
|
2020-04-17 17:47:10 +08:00 |
|