Commits · 5f91fbc970ab09907403d5b2ebd72c869224633e · 胡斌 / srs

14 Jul, 2015 7 commits
- 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 7 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
- fix #438 · f9257b89 ...
  f9257b89 Browse File
```
问题：edge模式，推流时异常断开。
    解决方法：增加edge模式推流检测。
```
  zhengfl authored 2015-07-08 15:43:09 +0800
- fix #437 · 120033e0 ...
  120033e0 浏览文件
```
edge模式，重新从源站拉流时，导致forwarders异常
```
  zhengfl authored 2015-07-08 11:47:34 +0800
06 Jul, 2015 3 commits
- refine config default values of srs, prepare to move each default values to functions. · f39faa78
  f39faa78 浏览文件
  
  winlin authored 2015-07-06 11:11:59 +0800
- Merge branch '2.0release' into develop · 9c716d47
  9c716d47 浏览文件
  
  winlin authored 2015-07-06 10:32:47 +0800
- use local openssl header files to avoid warnings on osx. · 3b8daafc
  3b8daafc 浏览文件
  
  winlin authored 2015-07-06 10:32:28 +0800
01 Jul, 2015 2 commits
- merge from 2.0release · c8fef99c
  c8fef99c 浏览文件
  
  winlin authored 2015-07-01 14:51:27 +0800
- fix #433, fix the sps parse bug. 2.0.176 · 438914c4
  438914c4 浏览文件
  
  winlin authored 2015-07-01 14:50:45 +0800
19 Jun, 2015 3 commits
- add srs_recvi_bytes for intranet bytes stat. · 312366bb
  312366bb 浏览文件
  
  winlin authored 2015-06-19 14:38:05 +0800
- fix network device compare bug. · 750399ac
  750399ac 浏览文件
  
  winlin authored 2015-06-19 13:51:40 +0800
- ignore any intranet bandwidth. · 8cd68a1e
  8cd68a1e 浏览文件
  
  winlin authored 2015-06-19 11:59:41 +0800
18 Jun, 2015 1 commit
- 修正编码风格问题 · 52110990
  52110990 Browse Directory
  
  zhengfl authored 2015-06-18 16:21:00 +0800
17 Jun, 2015 4 commits
- fix bug · b4ff9cfb ...
  b4ff9cfb 浏览文件
```
某种情况下，当客户端全部断开后，边缘服务器回源线程（EdgeIngester/EdgeForwarder）没有被断开。
```
  zhengfl authored 2015-06-17 23:09:17 +0800
- Merge branch '2.0release' into develop · 89517520
  89517520 Browse File
  
  winlin authored 2015-06-17 16:47:08 +0800
- Update README.md · 2e437a28 ...
  2e437a28 浏览文件
```
Correct path in installation instructions since project repository renamed to srs from simple-rtmp-server
```
  Jonathan Barratt authored 2015-06-17 16:46:39 +0800
- add comments for async call. · 8102a226
  8102a226 浏览文件
  
  winlin authored 2015-06-17 16:42:43 +0800