胡斌 / srs

17 Mar, 2015 8 commits
- 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
- for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143. · ab673e13
  ab673e13 浏览文件
  
  winlin authored 2015-03-17 22:06:59 +0800
- osx support build nginx and ffmpeg · a28c051c
  a28c051c 浏览文件
  
  winlin authored 2015-03-17 21:51:19 +0800
- check what a fuck os for some fresh. · f3e5431d
  f3e5431d Browse Directory
  
  winlin authored 2015-03-17 21:12:30 +0800
- Merge branch '2.0release' into develop · 79fbeeb8
  79fbeeb8 浏览文件
  
  winlin authored 2015-03-17 15:37:03 +0800
- fix bug, use size_t for string::npos · 8a4312f4
  8a4312f4 浏览文件
  
  winlin authored 2015-03-17 15:36:12 +0800
16 Mar, 2015 16 commits
- change verstion to 3.0.0 · 9e407d32
  9e407d32 浏览文件
  
  winlin authored 2015-03-17 07:58:38 +0800
- for #340, #343, add wiki and use srs string function, support hls_entry_prefix(h… · 2241ba0e ...
  2241ba0e Browse Directory
```
…ls base url). 2.0.142
```
  winlin authored 2015-03-17 07:57:58 +0800
- Merge branch 'wenjiegit-develop' into 2.0release · 1a12ff0d
  1a12ff0d 浏览文件
  
  winlin authored 2015-03-17 07:45:44 +0800
- Merge branch 'develop' of https://github.com/wenjiegit/simple-rtmp-server into wenjiegit-develop · 9c43c73d
  9c43c73d 浏览文件
  
  winlin authored 2015-03-17 07:45:27 +0800
- refine build for osx · 33e57959
  33e57959 浏览文件
  
  winlin authored 2015-03-16 22:25:59 +0800
- Merge branch 'wenjiegit-develop' into 2.0release · 806b45e8
  806b45e8 浏览文件
  
  winlin authored 2015-03-16 17:34:04 +0800
- Merge pull request #337 from tufang14/develop · 9a0a8aff ...
  9a0a8aff 浏览文件
```
可能数组越界
```
  winlin authored 2015-03-16 16:02:06 +0800
- Merge branch '2.0release' into develop · 685a29af
  685a29af 浏览文件
  
  winlin authored 2015-03-16 15:45:01 +0800
- for #334, refine code, use kbps instead skt of rtmp connection. · c92d40e0
  c92d40e0 浏览文件
  
  winlin authored 2015-03-16 15:40:43 +0800
- Modified on_close webhook. · a95bd7d3 ...
  a95bd7d3 浏览文件
```
Pass the send_bytes and recv_bytes count to the web hook.
```
  Nimrod A. Abing (on kohima) authored 2015-03-16 15:39:49 +0800
- for #308, disable st examples. for #334, refine the st init and event select. · bc931474
  bc931474 Browse Directory
  
  Nimrod A. Abing (on kohima) authored 2015-03-16 15:35:01 +0800
- 可能数组越界 · 6cf5a6a7 ...
  6cf5a6a7 浏览文件
```
可能数组越界
```
  tufang14 authored 2015-03-16 15:08:17 +0800
- add rudeb0t<nimrod@themanxgroup.tw> to authors. · d8f52918
  d8f52918 Browse File
  
  winlin authored 2015-03-16 13:40:10 +0800
- Added .AppleDouble folders to ignore patterns. · cea2e631
  cea2e631 Browse File
  
  Nimrod A. Abing (on eniwetok) authored 2015-03-16 13:35:29 +0800
- Merge branch '2.0release' into develop · 67671e43
  67671e43 浏览文件
  
  winlin authored 2015-03-16 10:24:25 +0800
- fix build failed bug. · 8ee0826e
  8ee0826e 浏览文件
  
  winlin authored 2015-03-16 10:24:19 +0800
15 Mar, 2015 9 commits
- Merge branch '2.0release' into develop · 19ec1daf
  19ec1daf 浏览文件
  
  winlin authored 2015-03-15 21:56:39 +0800
- remove the contact from index. · c32d9ee4
  c32d9ee4 Browse File
  
  winlin authored 2015-03-15 21:56:30 +0800
- Merge branch '2.0release' into develop · 0017ee85
  0017ee85 浏览文件
  
  winlin authored 2015-03-15 19:34:11 +0800
- update conf · 59d9af80
  59d9af80 浏览文件
  
  winlin authored 2015-03-15 19:34:04 +0800
- Merge branch '2.0release' into develop · ef39a88f
  ef39a88f 浏览文件
  
  winlin authored 2015-03-15 14:18:12 +0800
- update readme · 5d7c24de
  5d7c24de 浏览文件
  
  winlin authored 2015-03-15 14:18:05 +0800
- merge from 2.0 · a21243ea
  a21243ea 浏览文件
  
  winlin authored 2015-03-15 08:16:37 +0800
- update stable version check · d349a3db
  d349a3db Browse File
  
  winlin authored 2015-03-15 08:15:04 +0800
- fork srs2 and start srs3. 3.0.0 · 519c25a0
  519c25a0 浏览文件
  
  winlin authored 2015-03-15 08:06:41 +0800
14 Mar, 2015 7 commits
- start 2.0release, 80773 lines. · 636bc574
  636bc574 浏览文件
  
  winlin authored 2015-03-15 07:48:27 +0800
- add qq and weixin image. · 5e19f5f2
  5e19f5f2 浏览文件
  
  winlin authored 2015-03-14 22:14:04 +0800
- update donation · e6058c15
  e6058c15 Browse File
  
  winlin authored 2015-03-14 20:25:21 +0800
- fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. · 320f45c6
  320f45c6 Browse Directory
  
  winlin authored 2015-03-14 20:07:56 +0800
- for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139. · 27cb62b7
  27cb62b7 Browse File
  
  winlin authored 2015-03-14 19:45:13 +0800
- for #324, refine code for hstrs, support hijack handler. · 995b1300
  995b1300 浏览文件
  
  winlin authored 2015-03-14 14:55:45 +0800
- fix warning for xcode. · 5c6ef6de
  5c6ef6de 浏览文件
  
  winlin authored 2015-03-14 13:09:34 +0800