胡斌 / srs

10 Jun, 2015 4 commits
- merge from 2.0 · b0ce38dc
  b0ce38dc Browse File
  
  winlin authored 2015-06-10 15:38:44 +0800
- fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175 · 56938efd
  56938efd 浏览文件
  
  winlin authored 2015-06-10 15:38:13 +0800
- merge from srs2. · 12eab8a1
  12eab8a1 浏览文件
  
  winlin authored 2015-06-10 13:53:57 +0800
- fix #424, fix aggregate timestamp bug. 2.0.174 · 6941f2c0
  6941f2c0 浏览文件
  
  winlin authored 2015-06-10 13:53:13 +0800
09 Jun, 2015 8 commits
- refine the time jitter code. · 8e8c8108
  8e8c8108 浏览文件
  
  winlin authored 2015-06-09 21:04:30 +0800
- fix the export project bug. wakeup connection when dispose server. · 1f1776a0
  1f1776a0 Browse Directory
  
  winlin authored 2015-06-09 14:38:05 +0800
- Merge branch '2.0release' into develop · bf9166db
  bf9166db 浏览文件
  
  winlin authored 2015-06-09 11:51:49 +0800
- refine build summary. · 969ed7b0
  969ed7b0 浏览文件
  
  winlin authored 2015-06-09 11:51:40 +0800
- fix the thread stop bug, must wait when not joinable. · 66837ffa
  66837ffa 浏览文件
  
  winlin authored 2015-06-09 11:47:04 +0800
- refine the signal manager. · d317528a
  d317528a 浏览文件
  
  winlin authored 2015-06-09 11:19:28 +0800
- add warning for gmp, use gmc to detect memory leak. · 7996b3b7
  7996b3b7 浏览文件
  
  winlin authored 2015-06-09 10:52:32 +0800
- for memory leak detect, move the payload create to message. · f347099f
  f347099f 浏览文件
  
  winlin authored 2015-06-09 10:13:25 +0800
08 Jun, 2015 7 commits
- fix typo of code. · 863dddde
  863dddde 浏览文件
  
  winlin authored 2015-06-08 17:43:28 +0800
- merge from bravo, parse the http reponse in json of bravo system. · 19e1f610
  19e1f610 浏览文件
  
  winlin authored 2015-06-08 17:28:39 +0800
- Merge branch '2.0release' into develop · 00d1fdde
  00d1fdde 浏览文件
  
  winlin authored 2015-06-08 15:02:30 +0800
- use libfdk_aac for srs2. · 574cf6a0
  574cf6a0 浏览文件
  
  winlin authored 2015-06-08 15:02:19 +0800
- cleanup connections when terminate server. · 00a25ee5
  00a25ee5 浏览文件
  
  winlin authored 2015-06-08 14:08:12 +0800
- cleanup connections when terminate server. · d7e5df25
  d7e5df25 浏览文件
  
  winlin authored 2015-06-08 14:03:16 +0800
- refine the memory watcher. · 573495a1
  573495a1 Browse File
  
  winlin authored 2015-06-08 09:47:45 +0800
07 Jun, 2015 4 commits
- add srs memory watcher. · ca535fdb
  ca535fdb 浏览文件
  
  winlin authored 2015-06-07 15:14:25 +0800
- add srs memory watcher. · 8b3bd5b4
  8b3bd5b4 浏览文件
  
  winlin authored 2015-06-07 15:13:41 +0800
- add srs memory watcher. · bb4db611
  bb4db611 浏览文件
  
  winlin authored 2015-06-07 15:12:55 +0800
- dispose the gop cache · 811ef4bc
  811ef4bc 浏览文件
  
  winlin authored 2015-06-07 09:27:47 +0800
06 Jun, 2015 12 commits
- Merge branch '2.0release' into develop · 600e8e10
  600e8e10 浏览文件
  
  winlin authored 2015-06-06 22:04:37 +0800
- detect the monotonically increase and warn to use mix_correct · beb04317
  beb04317 浏览文件
  
  winlin authored 2015-06-06 22:04:24 +0800
- Merge branch '2.0release' into develop · 57f01185
  57f01185 浏览文件
  
  winlin authored 2015-06-06 21:54:54 +0800
- refine the mix correct algorithm, mix when got 10+ av or got 1 video and 1 audio. · 2d9f258e
  2d9f258e 浏览文件
  
  winlin authored 2015-06-06 21:54:43 +0800
- Merge branch '2.0release' into develop · 17d6016b
  17d6016b 浏览文件
  
  winlin authored 2015-06-06 21:42:12 +0800
- use smaller value for publish timeout. · ec245339
  ec245339 浏览文件
  
  winlin authored 2015-06-06 21:42:01 +0800
- fix #421, when mix correct on, must check the type of dequeue msg. · a6dd8fb3
  a6dd8fb3 浏览文件
  
  winlin authored 2015-06-06 21:31:39 +0800
- Merge branch '2.0release' into develop · 5d75e32e
  5d75e32e 浏览文件
  
  winlin authored 2015-06-06 21:24:06 +0800
- fix #421, drop video for unkown RTMP header. · a1dd7343
  a1dd7343 浏览文件
  
  winlin authored 2015-06-06 21:23:57 +0800
- fix the build failed bug. · 679b4317
  679b4317 浏览文件
  
  winlin authored 2015-06-06 20:34:49 +0800
- fix gop cache, drop video only when video and not h.264 · 0fbfad41
  0fbfad41 Browse Directory
  
  winlin authored 2015-06-06 20:23:18 +0800
- refine the pithy print of ingesters. · 2a1db367
  2a1db367 浏览文件
  
  winlin authored 2015-06-06 18:57:41 +0800
05 Jun, 2015 4 commits
- Merge branch '2.0release' into develop · d10d5771
  d10d5771 浏览文件
  
  winlin authored 2015-06-05 21:34:39 +0800
- fix the hls bug · e4c27a51
  e4c27a51 浏览文件
  
  winlin authored 2015-06-05 21:34:28 +0800
- Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release · 4400b125
  4400b125 浏览文件
  
  winlin authored 2015-06-05 20:38:51 +0800
- fix #420, remove ts for hls ram mode. · 26b76c0e
  26b76c0e Browse File
  
  winlin authored 2015-06-05 20:38:01 +0800
03 Jun, 2015 1 commit
- Merge branch '2.0release' into develop · 5dd81d18
  5dd81d18 浏览文件
  
  winlin authored 2015-06-03 10:13:58 +0800