胡斌 / srs

继续操作前请注册或者登录。

21 Jul, 2015 5 commits
- merge from 2.0 · 94569b18
  94569b18 Browse File
  
  winlin authored 2015-07-21 12:08:05 +0800
- fix #169, support default values for transcode. 2.0.180 · c85f92c2
  c85f92c2 浏览文件
  
  winlin authored 2015-07-21 12:07:26 +0800
- Merge branch '2.0release' into develop · 48c040c9
  48c040c9 Browse File
  
  winlin authored 2015-07-21 11:41:13 +0800
- update hls and transcode wiki · 89183c52
  89183c52 Browse File
  
  winlin authored 2015-07-21 11:41:02 +0800
- fix #435, add pageUrl for HTTP callback on_play. · 31d2de3f
  31d2de3f 浏览文件
  
  winlin authored 2015-07-21 10:50:57 +0800
20 Jul, 2015 2 commits
- merge from 2.0 · 146a44a2
  146a44a2 Browse Directory
  
  winlin authored 2015-07-20 09:32:46 +0800
- refine the hls, ignore packet when no sequence header. 2.0.179 · b54f9b0f
  b54f9b0f 浏览文件
  
  winlin authored 2015-07-20 09:31:46 +0800
17 Jul, 2015 2 commits
- merge from 2.0 · fdb17a18
  fdb17a18 浏览文件
  
  winlin authored 2015-07-17 14:06:15 +0800
- fix the hstrs bug on edge. · 3b65af9b
  3b65af9b 浏览文件
  
  winlin authored 2015-07-17 14:05:34 +0800
16 Jul, 2015 4 commits
- refine code for hstrs. · 99db2888
  99db2888 Browse Directory
  
  winlin authored 2015-07-16 18:42:27 +0800
- Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release · c2ef7795
  c2ef7795 Browse Directory
  
  winlin authored 2015-07-16 17:31:31 +0800
- for #441, use 30s timeout for first msg. 2.0.178 · 366d3a3f
  366d3a3f Browse Directory
  
  winlin authored 2015-07-16 17:30:27 +0800
- refine code:优化edge模式回源播放线程启动流程 · a5a9f7c8
  a5a9f7c8 浏览文件
  
  zhengfl authored 2015-07-16 11:36:14 +0800
14 Jul, 2015 9 commits
- merge 2.0release · 8e293f92
  8e293f92 浏览文件
  
  winlin authored 2015-07-14 11:47:08 +0800
- refine hls disable the time jitter, support not mix monotonically increase. 2.0.177 · 5f777240
  5f777240 Browse Directory
  
  winlin authored 2015-07-14 11:46:23 +0800
- merge from 2.0release · 5f91fbc9
  5f91fbc9 浏览文件
  
  winlin authored 2015-07-14 11:32:40 +0800
- fix the http flv mount bug. · d995726f
  d995726f 浏览文件
  
  winlin authored 2015-07-14 11:31:17 +0800
- refine the mix correct algorithm. · 9743e025
  9743e025 浏览文件
  
  winlin authored 2015-07-14 11:28:00 +0800
- when hls timestamp jump, reset it. · 6fe36afc
  6fe36afc 浏览文件
  
  winlin authored 2015-07-14 11:00:58 +0800
- ignore when no segments for there must no m3u8 · 99574bb7
  99574bb7 浏览文件
  
  winlin authored 2015-07-14 10:43:21 +0800
- always reset the max target duration for hls. · 40c264a3
  40c264a3 浏览文件
  
  winlin authored 2015-07-14 10:31:42 +0800
- change time jitter to off for hls and forward. · 54bb4248
  54bb4248 浏览文件
  
  winlin authored 2015-07-14 10:03:15 +0800
13 Jul, 2015 2 commits
- fix ingest flv tool, support non monotonically timestamp. · be342178
  be342178 浏览文件
  
  winlin authored 2015-07-13 22:09:01 +0800
- Update README.md · ef5ddd01
  ef5ddd01 浏览文件
  
  winlin authored 2015-07-13 12:08:53 +0800
10 Jul, 2015 4 commits
- fix the stream caster build failed bug. · b3b6df36
  b3b6df36 浏览文件
  
  winlin authored 2015-07-10 13:50:35 +0800
- refine code for http remux reload. · 50feaacd
  50feaacd 浏览文件
  
  winlin authored 2015-07-10 13:45:21 +0800
- Merge branch '2.0release' into develop · 677567d9
  677567d9 浏览文件
  
  winlin authored 2015-07-10 11:50:45 +0800
- fix #132: build failed when enable the info or verbose log. · 0aa05343
  0aa05343 浏览文件
  
  winlin authored 2015-07-10 11:50:35 +0800
09 Jul, 2015 7 commits
- Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release · 2567a895
  2567a895 浏览文件
  
  zhengfl authored 2015-07-09 15:49:23 +0800
- refine code: · 2263f2a6 ...
  2263f2a6 Browse File
```
优化 判断重复推流 及 推流流程
```
  zhengfl authored 2015-07-09 15:45:55 +0800
- refine the pithy print mechenism. · 404bc565
  404bc565 浏览文件
  
  winlin authored 2015-07-09 15:39:02 +0800
- Merge branch '2.0release' into develop · 97b8c996
  97b8c996 浏览文件
  
  winlin authored 2015-07-09 13:52:52 +0800
- fix #439: http remux support reload · bed540ba
  bed540ba 浏览文件
  
  winlin authored 2015-07-09 13:52:41 +0800
- refine file mode to 644 · da47f164
  da47f164 浏览文件
  
  winlin authored 2015-07-09 13:44:05 +0800
- refine code: 删除srs_app_edge中的user_stat相关代码。因为没有任何作用。 · f6a2cea7
  f6a2cea7 浏览文件
  
  zhengfl authored 2015-07-09 10:08:17 +0800
08 Jul, 2015 5 commits
- Merge branch '2.0release' into develop · 3dadad2d
  3dadad2d Browse Directory
  
  winlin authored 2015-07-08 17:45:08 +0800
- refine code, to 644 and unix encoding. · 0aed4088
  0aed4088 浏览文件
  
  winlin authored 2015-07-08 17:44:25 +0800
- Merge branch '2.0release' into develop · 210d0a67
  210d0a67 Browse Directory
  
  winlin authored 2015-07-08 17:42:47 +0800
- refine code, add comments for stat on_disconnect. · c6c90e26
  c6c90e26 浏览文件
  
  winlin authored 2015-07-08 17:42:35 +0800
- rewrite #438 · db9ea4e6
  db9ea4e6 Browse File
  
  zhengfl authored 2015-07-08 17:08:29 +0800