胡斌 / srs

03 Jun, 2015 2 commits
- Merge branch '2.0release' into develop · 5dd81d18
  5dd81d18 浏览文件
  
  winlin authored 2015-06-03 10:13:58 +0800
- disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls. · af9efe92
  af9efe92 浏览文件
  
  winlin authored 2015-06-03 10:13:46 +0800
02 Jun, 2015 2 commits
- Merge branch '2.0release' into develop · 982a937e
  982a937e 浏览文件
  
  winlin authored 2015-06-02 12:56:17 +0800
- copy the request for hls. · 4e42b9c6
  4e42b9c6 浏览文件
  
  winlin authored 2015-06-02 12:56:04 +0800
01 Jun, 2015 2 commits
- Merge branch '2.0release' into develop · 091b480a
  091b480a 浏览文件
  
  winlin authored 2015-06-01 10:14:58 +0800
- refine comments of ffmpeg. · 679583da
  679583da 浏览文件
  
  winlin authored 2015-06-01 10:14:46 +0800
30 May, 2015 13 commits
- Merge branch '2.0release' into develop · c1172c99
  c1172c99 浏览文件
  
  winlin authored 2015-05-30 21:40:51 +0800
- fix the audio or video pid generate bug. · 03d951c0
  03d951c0 Browse Directory
  
  winlin authored 2015-05-30 21:40:39 +0800
- Merge branch '2.0release' into develop · c3c4cb2f
  c3c4cb2f 浏览文件
  
  winlin authored 2015-05-30 21:20:21 +0800
- fix build bug. · 96f8f1f5
  96f8f1f5 浏览文件
  
  winlin authored 2015-05-30 21:20:07 +0800
- Merge branch '2.0release' into develop · 09750082
  09750082 浏览文件
  
  winlin authored 2015-05-30 21:14:56 +0800
- fix the build failed bug. · 0a87b567
  0a87b567 浏览文件
  
  winlin authored 2015-05-30 21:14:10 +0800
- merge from srs2 · 9dce971d
  9dce971d 浏览文件
  
  winlin authored 2015-05-30 14:41:47 +0800
- fix #209, cleanup hls when stop and timeout. 2.0.173. · 223ae194
  223ae194 浏览文件
  
  winlin authored 2015-05-30 14:41:09 +0800
- for #209, support cleanup when srs stop. · 4a80a5a7
  4a80a5a7 浏览文件
  
  winlin authored 2015-05-30 13:48:29 +0800
- for #374, use fast stop for ingesters to stop many FFMPEG. · 860d68e6
  860d68e6 浏览文件
  
  winlin authored 2015-05-30 11:25:33 +0800
- for #209, server cycle to enable the hls to cleanup. do dispose · d611bb6b
  d611bb6b 浏览文件
  
  winlin authored 2015-05-30 10:48:02 +0800
- fix #374: when terminate srs, cleanup to ensure FFMPEG quit. · 567d84e9
  567d84e9 Browse Directory
  
  winlin authored 2015-05-30 09:58:17 +0800
- for #374, use SIGINT then SIGKILL to try to kill FFMPEG gracefullly. · db57a519
  db57a519 Browse File
  
  winlin authored 2015-05-30 09:32:03 +0800
29 May, 2015 3 commits
- support pure video hls. · 597993d4
  597993d4 浏览文件
  
  winlin authored 2015-05-29 21:53:37 +0800
- fix #409: support pure video hls. 2.0.172. · 5caafadd
  5caafadd 浏览文件
  
  winlin authored 2015-05-29 21:43:17 +0800
- add HLS overload · 3ad030fe
  3ad030fe 浏览文件
  
  winlin authored 2015-05-29 17:56:05 +0800
28 May, 2015 5 commits
- Merge branch '2.0release' into develop · 27a1fee6
  27a1fee6 浏览文件
  
  winlin authored 2015-05-28 21:02:50 +0800
- for srs-dolphin, support HTTP and RTMP. · af4eec90
  af4eec90 Browse Directory
  
  winlin authored 2015-05-28 21:02:43 +0800
- support [srs-dolphin][srs-dolphin], the multiple-process SRS. · 41ead653
  41ead653 Browse File
  
  winlin authored 2015-05-28 19:58:16 +0800
- Merge branch '2.0release' into develop · b44987fa
  b44987fa 浏览文件
  
  winlin authored 2015-05-28 14:59:19 +0800
- support dolphin · 394e070b
  394e070b 浏览文件
  
  winlin authored 2015-05-28 14:59:12 +0800
27 May, 2015 8 commits
- refine code · e5461d2d
  e5461d2d 浏览文件
  
  winlin authored 2015-05-28 07:03:38 +0800
- Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release · 60775485
  60775485 浏览文件
  
  winlin authored 2015-05-27 23:44:07 +0800
- update readme · 385ee893
  385ee893 浏览文件
  
  winlin authored 2015-05-27 23:43:44 +0800
- fix #408:Queue丢视频时，不应该丢弃SequenceHeader · 4864e796
  4864e796 Browse Directory
  
  zhengfl authored 2015-05-27 16:16:15 +0800
- fix the test configure script · 7e04975b
  7e04975b 浏览文件
  
  winlin authored 2015-05-27 11:38:10 +0800
- fix the verbose build failed. · 1150cde8
  1150cde8 Browse Directory
  
  winlin authored 2015-05-27 11:12:52 +0800
- fix the bug of test configure script. · ca01bd40
  ca01bd40 Browse Directory
  
  winlin authored 2015-05-27 10:55:46 +0800
- fix bug of configure. · fec8422d
  fec8422d 浏览文件
  
  winlin authored 2015-05-27 10:23:40 +0800
26 May, 2015 4 commits
- fix the test configure script bug · eb488e3b
  eb488e3b Browse Directory
  
  winlin authored 2015-05-27 07:32:51 +0800
- add usage and make jobs support for configure test script · 02c4741d
  02c4741d 浏览文件
  
  winlin authored 2015-05-27 07:30:37 +0800
- support disable all · c1b9541b
  c1b9541b 浏览文件
  
  winlin authored 2015-05-27 07:22:44 +0800
- refine the configure test script. · 9ab579c6
  9ab579c6 Browse Directory
  
  winlin authored 2015-05-27 07:06:16 +0800
25 May, 2015 1 commit
- Merge branch '2.0release' into develop · 7349fed8
  7349fed8 浏览文件
  
  winlin authored 2015-05-25 09:59:57 +0800