胡斌 / srs

23 Mar, 2015 8 commits
- Merge branch '2.0release' into develop · d16ae193
  d16ae193 浏览文件
  
  winlin authored 2015-03-23 22:06:25 +0800
- fix #222, the dvr path rule changed. · fcab1774
  fcab1774 浏览文件
  
  winlin authored 2015-03-23 22:06:18 +0800
- Merge branch '2.0release' into develop · df3f2440
  df3f2440 浏览文件
  
  winlin authored 2015-03-23 21:21:42 +0800
- fix #302, remove the thread unsafe code, no static. · 02addf61
  02addf61 浏览文件
  
  winlin authored 2015-03-23 21:21:36 +0800
- fix #302, remove the thread unsafe code, no static. · bfa46e7a
  bfa46e7a 浏览文件
  
  winlin authored 2015-03-23 21:19:35 +0800
- fix #302, remove the thread unsafe code, no static. · f69fa727
  f69fa727 Browse Directory
  
  winlin authored 2015-03-23 21:19:04 +0800
- Merge branch '2.0release' into develop · 09ce6651
  09ce6651 浏览文件
  
  winlin authored 2015-03-23 17:49:52 +0800
- refine build for modules, add defines. · 1cb29928
  1cb29928 浏览文件
  
  winlin authored 2015-03-23 17:49:45 +0800
21 Mar, 2015 11 commits
- Merge branch '2.0release' into develop · 0a7b179e
  0a7b179e 浏览文件
  
  winlin authored 2015-03-21 15:38:29 +0800
- for #155, refine code, donot check network devices for osx. · 2f2aaf5e
  2f2aaf5e 浏览文件
  
  winlin authored 2015-03-21 15:38:22 +0800
- fix osx bug. · e7e17cf1
  e7e17cf1 浏览文件
  
  winlin authored 2015-03-21 15:24:26 +0800
- for #155, add todo for osx. 2.0.146 · 33cca3e0
  33cca3e0 Browse File
  
  winlin authored 2015-03-21 15:22:45 +0800
- Merge branch '2.0release' into develop · 4d27030c
  4d27030c Browse File
  
  winlin authored 2015-03-21 12:19:06 +0800
- big support from all friends of SRS · 6776065b
  6776065b 浏览文件
  
  winlin authored 2015-03-21 12:18:58 +0800
- Merge branch '2.0release' into develop · e45c6200
  e45c6200 浏览文件
  
  winlin authored 2015-03-21 11:55:35 +0800
- for #354, remove the double underscore functions and variables. · bbac2348
  bbac2348 Browse Directory
  
  winlin authored 2015-03-21 11:55:28 +0800
- for #354, remove the double underscore of macro. · 7065db19
  7065db19 Browse File
  
  winlin authored 2015-03-21 10:42:55 +0800
- Merge branch '2.0release' into develop · 45d90180
  45d90180 浏览文件
  
  winlin authored 2015-03-21 10:25:09 +0800
- for #354, remove the double underscore of macro. · c6817cc4
  c6817cc4 浏览文件
  
  winlin authored 2015-03-21 10:25:03 +0800
20 Mar, 2015 2 commits
- Merge branch '2.0release' into develop · 3ca906d5
  3ca906d5 浏览文件
  
  winlin authored 2015-03-20 15:10:34 +0800
- remove the sudo of log. · 014993ad
  014993ad 浏览文件
  
  winlin authored 2015-03-20 15:10:17 +0800
19 Mar, 2015 5 commits
- for #151, add comments for the audio overflow ratio. · a4709a64
  a4709a64 浏览文件
  
  winlin authored 2015-03-19 21:08:42 +0800
- Merge branch '2.0release' into develop · b1142d83
  b1142d83 浏览文件
  
  winlin authored 2015-03-19 17:24:37 +0800
- support config the audio overflow ratio. · 0319e85f
  0319e85f 浏览文件
  
  winlin authored 2015-03-19 17:24:27 +0800
- merge from 2.0 · b7138ba9
  b7138ba9 浏览文件
  
  winlin authored 2015-03-19 10:17:51 +0800
- 小瑕疵 · e319da33 ...
  e319da33 浏览文件
```
小瑕疵
```
  tufang14 authored 2015-03-19 10:16:58 +0800
18 Mar, 2015 5 commits
- support got uptime and loadavg for osx. 2.0.145 · f564c903
  f564c903 Browse Directory
  
  winlin authored 2015-03-18 22:30:17 +0800
- Merge branch '2.0release' into develop · 4a50bf18
  4a50bf18 浏览文件
  
  winlin authored 2015-03-18 16:50:54 +0800
- refine the fast buffer to more readable. · fbd722bf
  fbd722bf Browse Directory
  
  winlin authored 2015-03-18 16:50:47 +0800
- merge from 2.0 · d25eb0aa
  d25eb0aa 浏览文件
  
  winlin authored 2015-03-18 16:35:24 +0800
- refine the fast buffer. 2.0.144 · f36e4a44
  f36e4a44 Browse Directory
  
  winlin authored 2015-03-18 16:34:27 +0800
17 Mar, 2015 9 commits
- for SRS3. · 196e1c50
  196e1c50 浏览文件
  
  winlin authored 2015-03-17 23:57:05 +0800
- revert to SRS2. · 11b93803
  11b93803 浏览文件
  
  winlin authored 2015-03-17 23:55:56 +0800
- revert the changes for SRS2. · 6a987584
  6a987584 Browse Directory
  
  winlin authored 2015-03-17 23:51:10 +0800
- merge from 2.0release · df2644c8
  df2644c8 浏览文件
  
  winlin authored 2015-03-17 23:48:50 +0800
- Merge branch 'tufang14-develop' into 2.0release · 9ed0da24
  9ed0da24 浏览文件
  
  winlin authored 2015-03-17 23:46:25 +0800
- Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop · 6855ab4c
  6855ab4c Browse Directory
  
  winlin authored 2015-03-17 23:46:09 +0800
- Merge branch '2.0release' into develop · 9bf6c9e9
  9bf6c9e9 浏览文件
  
  winlin authored 2015-03-17 22:36:04 +0800
- for #155, osx(darwin) enable http api and stat, rusage is ok. · cf3becbc
  cf3becbc 浏览文件
  
  winlin authored 2015-03-17 22:35:47 +0800
- for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143. · 9f81a8b7
  9f81a8b7 浏览文件
  
  winlin authored 2015-03-17 22:07:38 +0800