胡斌 / srs

11 Nov, 2015 2 commits
- rename org simle-rtmp-server to ossrs · 01c46bdb
  01c46bdb 浏览文件
  
  winlin authored 2015-11-11 10:45:45 +0800
- rename org simple-rtmp-server to ossrs · 1ffd5fd4
  1ffd5fd4 浏览文件
  
  winlin authored 2015-11-11 10:37:50 +0800
10 Nov, 2015 5 commits
- Merge branch '2.0release' into develop · 6c7a51d3
  6c7a51d3 浏览文件
  
  winlin authored 2015-11-10 12:16:08 +0800
- change simple-rtmp-server org to ossrs · 1d8318d2
  1d8318d2 Browse Directory
  
  winlin authored 2015-11-10 12:16:01 +0800
- Merge branch '2.0release' into develop · d2ccc4f6
  d2ccc4f6 浏览文件
  
  winlin authored 2015-11-10 12:15:00 +0800
- Merge pull request #522 from ossrs/hotfix/commit · 1c944ed4 ...
  1c944ed4 浏览文件
```
use /usr/local/bin for osx.
```
  winlin authored 2015-11-10 12:12:00 +0800
- use /usr/local/bin for osx. · 8c04b17d
  8c04b17d 浏览文件
  
  winlin authored 2015-11-10 12:03:52 +0800
09 Nov, 2015 4 commits
- Merge branch '2.0release' into develop · 7db7d43a
  7db7d43a Browse Directory
  
  winlin authored 2015-11-09 15:25:55 +0800
- support query server by id. · 18b50d96
  18b50d96 浏览文件
  
  winlin authored 2015-11-09 15:19:50 +0800
- Merge branch '2.0release' into develop · aca9fe80
  aca9fe80 Browse Directory
  
  winlin authored 2015-11-09 14:51:47 +0800
- refine the api server. · d916c537
  d916c537 浏览文件
  
  winlin authored 2015-11-09 14:51:41 +0800
06 Nov, 2015 3 commits
- merge srs2. · a3a6282f
  a3a6282f 浏览文件
  
  winlin authored 2015-11-06 10:52:29 +0800
- update readme for #511. · a89ed68a
  a89ed68a 浏览文件
  
  winlin authored 2015-11-06 10:51:32 +0800
- fix build failed for utest. · 75be1813
  75be1813 浏览文件
  
  winlin authored 2015-11-06 10:26:18 +0800
05 Nov, 2015 5 commits
- merge from srs2. · 6df4d1f0
  6df4d1f0 浏览文件
  
  winlin authored 2015-11-05 15:12:49 +0800
- fix utest build failed for osx. · 98e25def
  98e25def 浏览文件
  
  winlin authored 2015-11-05 15:11:59 +0800
- merge from srs2 · 97f5bb8b
  97f5bb8b Browse File
  
  winlin authored 2015-11-05 14:48:25 +0800
- 允许操作SrsStream中的函数时，长度为0. · 38b81ce3
  38b81ce3 Browse Directory
  
  zhengfl authored 2015-11-05 14:37:21 +0800
- fix #511, fix the bug of thread stop invalid. · 1dae8fc9
  1dae8fc9 浏览文件
  
  zhengfl authored 2015-11-05 13:52:59 +0800
02 Nov, 2015 15 commits
- Merge branch '2.0release' into develop · 6e3eb50b
  6e3eb50b 浏览文件
  
  winlin authored 2015-11-02 13:51:07 +0800
- fix typo · 6d0adb9f
  6d0adb9f Browse File
  
  winlin authored 2015-11-02 13:51:01 +0800
- merge from srs2.0.198 · 302be41d
  302be41d 浏览文件
  
  winlin authored 2015-11-02 13:49:27 +0800
- fix typo in readme. · 57536bf4
  57536bf4 Browse File
  
  winlin authored 2015-11-02 13:47:56 +0800
- merge from srs2. · 2b21a63d
  2b21a63d 浏览文件
  
  winlin authored 2015-11-02 13:43:22 +0800
- for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198 · 49d77b3f
  49d77b3f Browse File
  
  winlin authored 2015-11-02 13:42:05 +0800
- fix the parse rtmp url bug for ingest. · 4b5eb5ea
  4b5eb5ea 浏览文件
  
  winlin authored 2015-11-02 13:37:44 +0800
- merge from srs2. · e3407c1d
  e3407c1d 浏览文件
  
  winlin authored 2015-11-02 11:49:23 +0800
- quit child process when fork failed. · ec225b21
  ec225b21 浏览文件
  
  winlin authored 2015-11-02 11:46:33 +0800
- quit child process when fork failed. · 9d7826c6
  9d7826c6 浏览文件
  
  winlin authored 2015-11-02 11:44:22 +0800
- for #515, merge from srs2, use SrsAutoFreeA. · f57e5376
  f57e5376 浏览文件
  
  winlin authored 2015-11-02 11:29:20 +0800
- for #515, use SrsAutoFreeA to free the array. · f4f76cd1
  f4f76cd1 浏览文件
  
  winlin authored 2015-11-02 11:26:37 +0800
- for #515, use srs_freepa to free array. · 604486b0
  604486b0 Browse Directory
  
  winlin authored 2015-11-02 11:11:49 +0800
- merge srs2, use srs_freepa for array · 8cec06e8
  8cec06e8 Browse Directory
  
  winlin authored 2015-11-02 11:05:39 +0800
- for #515, use srs_freepa to free the array. · 2af77497
  2af77497 浏览文件
  
  winlin authored 2015-11-02 11:02:27 +0800
28 Oct, 2015 6 commits
- fix the config bug. · cef1ae5a
  cef1ae5a 浏览文件
  
  winlin authored 2015-10-28 12:55:16 +0800
- fix the warnings · 9ebb77d7
  9ebb77d7 Browse Directory
  
  winlin authored 2015-10-28 11:58:49 +0800
- merge srs2 · e9e202db
  e9e202db Browse Directory
  
  winlin authored 2015-10-28 11:51:32 +0800
- for ExoPlayer, remove duration for live. · ef00005a
  ef00005a Browse Directory
  
  winlin authored 2015-10-28 11:51:03 +0800
- merge srs2 · 8c96472c
  8c96472c Browse File
  
  winlin authored 2015-10-28 11:03:15 +0800
- for ExoPlayer, add av tag in flv header. 2.0.197 · 50a7b9c1
  50a7b9c1 Browse Directory
  
  winlin authored 2015-10-28 11:01:20 +0800