胡斌 / srs

09 Jan, 2015 1 commit
- Merge pull request #282 from tufang14/develop · b3225100 ...
  b3225100 浏览文件
```
add client num in statistic with traverse every client for #227
```
  winlin authored 2015-01-09 09:00:08 +0800
08 Jan, 2015 8 commits
- add client num in statistic with traverse every client · 310e49e7
  310e49e7 浏览文件
  
  qiang.li authored 2015-01-08 21:58:10 +0800
- update readme · b1187b8c
  b1187b8c 浏览文件
  
  winlin authored 2015-01-08 19:04:19 +0800
- update readme. · c80477d5
  c80477d5 浏览文件
  
  winlin authored 2015-01-08 19:03:41 +0800
- merge from feilong, fix hls msg memory leak bug. · 982e9555
  982e9555 浏览文件
  
  winlin authored 2015-01-08 17:48:45 +0800
- merge from feilong for bug #281. · b4667569
  b4667569 浏览文件
  
  winlin authored 2015-01-08 17:44:08 +0800
- fix #281, fix hls bug ignore type-9 send aud. 1.0.20 · 27e0521a
  27e0521a 浏览文件
  
  winlin authored 2015-01-08 17:37:28 +0800
- merge http api from tufang. 2.0.92 · 6c833902
  6c833902 浏览文件
  
  winlin authored 2015-01-08 16:02:33 +0800
- Merge pull request #279 from tufang14/develop · ac584a4d ...
  ac584a4d 浏览文件
```
add client num for stream in statistic for #227
```
  winlin authored 2015-01-08 15:52:44 +0800
07 Jan, 2015 8 commits
- add client num for stream in statistic · 46d71661
  46d71661 浏览文件
  
  qiang.li authored 2015-01-07 23:27:24 +0800
- refine the print info. · 44f5efda
  44f5efda 浏览文件
  
  winlin authored 2015-01-07 15:46:00 +0800
- fix the aggregate bug, adjust to starttime of msg. 2.0.91 · 0e9c9db3
  0e9c9db3 浏览文件
  
  winlin authored 2015-01-07 15:37:44 +0800
- fix the rtmp dump, parse the aggregate msg. · 5aa31568
  5aa31568 浏览文件
  
  winlin authored 2015-01-07 15:35:01 +0800
- refine dvr and rtmp dump, write the original data. · 5661fc26
  5661fc26 浏览文件
  
  winlin authored 2015-01-07 15:01:58 +0800
- refine code, the consumer always alive longer than queue recv thread. · a402ca71
  a402ca71 浏览文件
  
  winlin authored 2015-01-07 14:31:42 +0800
- refine code, failed when specified complex but no ssl for srslibrtmp · 89a3cf9e
  89a3cf9e 浏览文件
  
  winlin authored 2015-01-07 13:37:23 +0800
- for bug #215, srs rtmp dump support conn args. 2.0.90 · 0e03d019
  0e03d019 浏览文件
  
  winlin authored 2015-01-07 13:29:30 +0800
06 Jan, 2015 1 commit
- add play client num in statistic · 08e9f6ef
  08e9f6ef 浏览文件
  
  qiang.li authored 2015-01-06 22:20:31 +0800
05 Jan, 2015 10 commits
- Merge pull request #1 from winlinvip/develop · 532a4840 ...
  532a4840 浏览文件
```
merge origin
```
  tufang14 authored 2015-01-05 14:02:29 +0800
- Merge branch 'tufang14-develop' into develop · 4c182346
  4c182346 浏览文件
  
  winlin authored 2015-01-05 13:08:23 +0800
- refine code, use global virtual id to generate the id of vhost and stream. · f1efdcd0
  f1efdcd0 浏览文件
  
  winlin authored 2015-01-05 13:08:11 +0800
- refine code, implements the stat.: · ae63af6a
  ae63af6a 浏览文件
  
  winlin authored 2015-01-05 12:57:48 +0800
- refine the api, response the error code and data. · 97bea514
  97bea514 浏览文件
  
  winlin authored 2015-01-05 12:49:00 +0800
- refine the statistic arch. · cc796a43
  cc796a43 浏览文件
  
  winlin authored 2015-01-05 12:40:38 +0800
- refine code to use the one coding style. · 40ed2249
  40ed2249 浏览文件
  
  winlin authored 2015-01-05 12:20:46 +0800
- replace the TAB with 4spaces · 4bb17f0c
  4bb17f0c 浏览文件
  
  winlin authored 2015-01-05 12:14:02 +0800
- add srs_app_statistic to upp project. · 344ff24f
  344ff24f 浏览文件
  
  winlin authored 2015-01-05 12:12:21 +0800
- merge with security bug fix. · 67adc8dc
  67adc8dc 浏览文件
  
  winlin authored 2015-01-05 12:09:15 +0800
04 Jan, 2015 2 commits
- add statistic for stream · a4a93613
  a4a93613 浏览文件
  
  qiang.li authored 2015-01-04 22:47:12 +0800
- update readme · 32657b0a
  32657b0a 浏览文件
  
  winlin authored 2015-01-04 16:37:33 +0800
03 Jan, 2015 10 commits
- update readme for security · 2ea1c4fb
  2ea1c4fb 浏览文件
  
  winlin authored 2015-01-03 22:31:10 +0800
- fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 · dc11418c
  dc11418c 浏览文件
  
  winlin authored 2015-01-03 15:33:23 +0800
- hotfix to remove the pageUrl for http callback. 2.0.88 · dd2c7e0b
  dd2c7e0b 浏览文件
  
  winlin authored 2015-01-03 15:08:46 +0800
- hotfix to remove the pageUrl for http callback. 1.0.19 · 247b7724
  247b7724 浏览文件
  
  winlin authored 2015-01-03 15:07:12 +0800
- remove the change vhost forward. · 7f60d472
  7f60d472 浏览文件
  
  winlin authored 2015-01-03 14:47:19 +0800
- update conf for transcode. · 45724bfa
  45724bfa 浏览文件
  
  winlin authored 2015-01-03 14:46:29 +0800
- Merge branch '1.0release' into develop · 0b9bbdbe
  0b9bbdbe 浏览文件
  
  winlin authored 2015-01-03 13:30:13 +0800
- fix the compile failed for utest at 32bits cpus · f9a33fbe
  f9a33fbe 浏览文件
  
  winlin authored 2015-01-03 13:29:52 +0800
- get stream info use http api #227 · 8d534d34
  8d534d34 浏览文件
  
  qiang.li authored 2015-01-03 12:57:13 +0800
- fix #179: dvr support custom filepath by variables. 2.0.87 · f881bc43
  f881bc43 浏览文件
  
  winlin authored 2015-01-03 12:54:54 +0800