胡斌 / srs

29 Apr, 2015 19 commits
- Merge branch '2.0release' into develop · 91e285b0
  91e285b0 Browse Directory
  
  winlin authored 2015-04-29 18:46:54 +0800
- change primary to the primary branch. · 4b372d8d
  4b372d8d Browse Directory
  
  winlin authored 2015-04-29 18:46:47 +0800
- Merge branch '2.0release' into develop · 94681702
  94681702 Browse Directory
  
  winlin authored 2015-04-29 18:03:20 +0800
- migarate to srs org. · e63b8eda
  e63b8eda 浏览文件
  
  winlin authored 2015-04-29 18:03:17 +0800
- Merge branch '2.0release' into develop · 42ddb765
  42ddb765 Browse Directory
  
  winlin authored 2015-04-29 18:01:24 +0800
- migarate to srs org. · 8603dba6
  8603dba6 浏览文件
  
  winlin authored 2015-04-29 18:01:16 +0800
- migarate from winlinvip to srs org, move the copyright to srs org. · 5819614f
  5819614f Browse File
  
  winlin authored 2015-04-29 17:49:42 +0800
- migarate from winlinvip to srs org, move the copyright to srs org. · fff838e4
  fff838e4 浏览文件
  
  winlin authored 2015-04-29 17:48:52 +0800
- Merge branch '2.0release' into develop · 17b15dee
  17b15dee Browse Directory
  
  winlin authored 2015-04-29 17:38:29 +0800
- migarate from winlinvip to srs org, move the copyright to srs org. · b23e196f
  b23e196f 浏览文件
  
  winlin authored 2015-04-29 17:38:23 +0800
- Merge branch '2.0release' into develop · 9189a408
  9189a408 浏览文件
  
  winlin authored 2015-04-29 17:28:23 +0800
- migarate from winlinvip to srs org. · 90b80ffc
  90b80ffc 浏览文件
  
  winlin authored 2015-04-29 17:28:15 +0800
- Merge branch '2.0release' into develop · 53e92a17
  53e92a17 Browse Directory
  
  winlin authored 2015-04-29 17:06:40 +0800
- migarate from winlinvip to srs org · 115daa3c
  115daa3c 浏览文件
  
  winlin authored 2015-04-29 17:06:32 +0800
- Merge branch '2.0release' into develop · 5559fb98
  5559fb98 Browse Directory
  
  winlin authored 2015-04-29 15:44:53 +0800
- update git commit · b3bd007f
  b3bd007f Browse Directory
  
  winlin authored 2015-04-29 15:09:03 +0800
- Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release · fc219866
  fc219866 浏览文件
  
  winlin authored 2015-04-29 09:25:25 +0800
- Merge branch '2.0release' into develop · ae6d0a5a
  ae6d0a5a Browse Directory
  
  winlin authored 2015-04-29 09:25:08 +0800
- update donation for wangguanghui. · 24739a40
  24739a40 Browse File
  
  winlin authored 2015-04-29 09:24:56 +0800
25 Apr, 2015 2 commits
- Merge pull request #392 from tufang14/2.0release · 8a29889a ...
  8a29889a 浏览文件
```
m3u8 mount bug
```
  winlin authored 2015-04-25 20:48:09 +0800
- m3u8 mount bug · b6d650cd
  b6d650cd 浏览文件
  
  tufang14 authored 2015-04-25 14:59:12 +0800
23 Apr, 2015 3 commits
- add script check_hls_backup.sh to research hls. · dbcd7d88
  dbcd7d88 浏览文件
  
  winlin authored 2015-04-23 16:58:00 +0800
- fix the config parse error. · e5099627
  e5099627 Browse Directory
  
  winlin authored 2015-04-23 16:25:49 +0800
- update on_hls, add ts_url, m3u8 and m3u8_url. · 0acb942c
  0acb942c 浏览文件
  
  winlin authored 2015-04-23 12:05:24 +0800
22 Apr, 2015 2 commits
- refine hls ingester, quit when error. · 7b157b06
  7b157b06 浏览文件
  
  winlin authored 2015-04-22 09:04:18 +0800
- refine hls ingester, quit when error. · aabe8404
  aabe8404 浏览文件
  
  winlin authored 2015-04-22 09:01:38 +0800
21 Apr, 2015 7 commits
- Merge branch '2.0release' into develop · 114f4447
  114f4447 浏览文件
  
  winlin authored 2015-04-21 18:18:59 +0800
- refine the overflow algorithm, prevent smaller piece. · 4e5ddb51
  4e5ddb51 Browse Directory
  
  winlin authored 2015-04-21 16:21:22 +0800
- refine the overflow algorithm, prevent smaller piece. · 1d973e21
  1d973e21 Browse Directory
  
  winlin authored 2015-04-21 16:18:37 +0800
- abs overflow also plus the deviation, for pure audio hls. · d19dfa52
  d19dfa52 Browse Directory
  
  winlin authored 2015-04-21 14:35:28 +0800
- use atc for ingest hls aac time. · c514a4ce
  c514a4ce Browse File
  
  winlin authored 2015-04-21 12:58:54 +0800
- Merge branch '2.0release' into develop · 3e0ba172
  3e0ba172 浏览文件
  
  winlin authored 2015-04-21 12:53:52 +0800
- support ingest hls with m3u8 in m3u8. · a28eec89
  a28eec89 Browse File
  
  winlin authored 2015-04-21 12:53:45 +0800
20 Apr, 2015 6 commits
- Merge branch '2.0release' into develop · 7d5f1c2b
  7d5f1c2b Browse Directory
  
  winlin authored 2015-04-20 18:31:52 +0800
- support hls ingest, fix the bugs. · ba673683
  ba673683 浏览文件
  
  winlin authored 2015-04-20 18:31:45 +0800
- support ingest hls live stream to RTMP. · 2239e9f1
  2239e9f1 Browse Directory
  
  winlin authored 2015-04-20 16:25:48 +0800
- merge from github · 23b978c0
  23b978c0 Browse Directory
  
  winlin authored 2015-04-20 11:28:46 +0800
- Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release · 623e37e2
  623e37e2 Browse Directory
  
  winlin authored 2015-04-20 11:28:20 +0800
- support aac_adtstoasc filter to copy mode. · 6e5c587e
  6e5c587e 浏览文件
  
  winlin authored 2015-04-20 11:24:12 +0800
19 Apr, 2015 1 commit
- Merge pull request #388 from neojiang/2.0release · e12fd5bc ...
  e12fd5bc 浏览文件
```
for #384,refine code for empty body request.
```
  winlin authored 2015-04-19 13:17:21 +0800