胡斌 / srs

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
18 Apr, 2015 3 commits
- for #384,refine code for empty body request. · aca02b6d
  aca02b6d 浏览文件
  
  J authored 2015-04-18 14:51:33 +0800
- for #384,refine code for empty body request. · 8adbdc39
  8adbdc39 Browse Directory
  
  J authored 2015-04-18 14:42:16 +0800
- for #384,refine code for empty body request. · a71db536
  a71db536 Browse Directory
  
  J authored 2015-04-18 14:33:57 +0800
17 Apr, 2015 2 commits
- Merge pull request #386 from neojiang/2.0release · 0a8ba6ad ...
  0a8ba6ad 浏览文件
```
fix #384
```
  winlin authored 2015-04-17 11:47:57 +0800
- fix #384 · 56f75cbb
  56f75cbb 浏览文件
  
  J authored 2015-04-17 10:12:52 +0800
15 Apr, 2015 3 commits
- merge from 2.0release · 6726a88f
  6726a88f 浏览文件
  
  winlin authored 2015-04-15 17:12:57 +0800
- fix #383, support mix_correct algorithm. 2.0.161. · 22ca4635
  22ca4635 浏览文件
  
  winlin authored 2015-04-15 17:12:22 +0800
- for #383, refine code to support mix correct algorithm. · 8fbc6526
  8fbc6526 Browse File
  
  winlin authored 2015-04-15 16:17:52 +0800
14 Apr, 2015 3 commits
- fix the hls notify bug, pass the query to get path. · 542aab45
  542aab45 浏览文件
  
  winlin authored 2015-04-14 17:53:53 +0800
- Merge branch '2.0release' into develop · 70c1d3cc
  70c1d3cc Browse Directory
  
  winlin authored 2015-04-14 11:37:06 +0800
- for #381, refine the hls notify, report one by one. · 02a2cb7e
  02a2cb7e Browse Directory
  
  winlin authored 2015-04-14 11:36:58 +0800
13 Apr, 2015 4 commits
- add todo for ts parse. · a4216cc5
  a4216cc5 浏览文件
  
  winlin authored 2015-04-13 16:40:31 +0800
- for #381, refine the deviation for hls. · 40eab7fc
  40eab7fc Browse Directory
  
  winlin authored 2015-04-13 11:45:08 +0800
- merge from 2.0.160: · 0c939e71
  0c939e71 Browse Directory
  
  winlin authored 2015-04-13 10:33:08 +0800
- fix #381, support reap hls/ts by gop or not. 2.0.160. · dcac9c69
  dcac9c69 浏览文件
  
  winlin authored 2015-04-13 10:32:32 +0800
11 Apr, 2015 2 commits
- Merge branch '2.0release' into develop · 52a8c90b
  52a8c90b 浏览文件
  
  winlin authored 2015-04-11 12:49:20 +0800
- update donation. · d2c63d81
  d2c63d81 Browse File
  
  winlin authored 2015-04-11 12:49:14 +0800
10 Apr, 2015 15 commits
- Merge branch '2.0release' into develop · 9759b78d
  9759b78d 浏览文件
  
  winlin authored 2015-04-10 21:06:16 +0800
- update donation. · bedc4f00
  bedc4f00 Browse File
  
  winlin authored 2015-04-10 21:06:09 +0800
- refine the proxy api server. · 0000c945
  0000c945 Browse Directory
  
  winlin authored 2015-04-10 16:07:45 +0800
- add proxy for hls · fe1886aa
  fe1886aa 浏览文件
  
  winlin authored 2015-04-10 15:50:12 +0800
- fix async call and hls_nb_notify bug. · e5b8e0da
  e5b8e0da Browse Directory
  
  winlin authored 2015-04-10 15:00:07 +0800
- support config the hls_nb_notify. · 5d37e477
  5d37e477 浏览文件
  
  winlin authored 2015-04-10 14:44:18 +0800
- refine http read, support c style api · 0a7cea06
  0a7cea06 浏览文件
  
  winlin authored 2015-04-10 14:25:14 +0800
- refine hls on_hls_notify, read a little of ts. · 5c00ce8a
  5c00ce8a 浏览文件
  
  winlin authored 2015-04-10 14:17:49 +0800
- refine hls notify, support timeout. · 1f93fb33
  1f93fb33 Browse File
  
  winlin authored 2015-04-10 13:45:21 +0800
- refine the hls_on_notify, calc the spent time in ms. · d8988da0
  d8988da0 Browse Directory
  
  winlin authored 2015-04-10 12:32:34 +0800
- refine the hls_on_notify, calc the spent time in ms. · 310157ab
  310157ab Browse File
  
  winlin authored 2015-04-10 12:30:22 +0800
- refine the hls_on_notify, only read a chunk. · e6d6bdfe
  e6d6bdfe Browse File
  
  winlin authored 2015-04-10 12:27:30 +0800
- Merge branch '2.0release' into develop · 17c1423f
  17c1423f Browse Directory
  
  winlin authored 2015-04-10 12:01:52 +0800
- enhanced on_hls_notify, support HTTP GET when reap ts. · e3c6e525
  e3c6e525 Browse File
  
  winlin authored 2015-04-10 12:01:45 +0800
- refine the hls deviation for floor algorithm. · 7dbc95e0
  7dbc95e0 Browse File
  
  winlin authored 2015-04-10 10:21:30 +0800
09 Apr, 2015 1 commit
- Merge branch '2.0release' into develop · 425e69e0
  425e69e0 Browse Directory
  
  winlin authored 2015-04-09 18:03:55 +0800