| 
								
								
									 winlin | 6990508e58 | for #485, srs for respberrypi and cubieboard. 2.0.191 | 2015-09-23 11:05:56 +08:00 |  | 
				
					
						| 
								
								
									 winlin | b5996567e8 | refine the role of srs, to cluster. | 2015-09-21 12:09:09 +08:00 |  | 
				
					
						| 
								
								
									 winlin | d8a64aaab5 | fix #484, hotfix the openssl build script 2.0.190 | 2015-09-21 12:01:48 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 8a90e76637 | fix #459, support dvr raw api. 3.0.4 | 2015-09-15 23:00:00 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 2a1b2b69a0 | for #459, dvr support apply filter for ng-control dvr module. | 2015-09-15 15:58:57 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 8f9cfcdcf4 | fix #319, http raw api support update global and vhost. 3.0.4 | 2015-09-15 13:03:18 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 511627abab | fix #474, config to donot parse width/height from sps. 2.0.189 | 2015-09-14 18:36:44 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 0d57ef9373 | fix #458, http hooks use source thread cid. 2.0.188 | 2015-09-14 13:47:25 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 6d50aa1aa2 | #475, fix http hooks crash for st context switch. 2.0.187 | 2015-09-14 12:22:19 +08:00 |  | 
				
					
						| 
								
								
									 winlin | abd7ee227c | support reload utc_time. 2.0.186 | 2015-09-09 23:37:07 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 11c409688b | for #319, http raw api support query. 3.0.3 | 2015-08-31 23:34:03 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 1b1a2a1e63 | fix #471, api response the width and height. 3.0.2 | 2015-08-28 18:00:24 +08:00 |  | 
				
					
						| 
								
								
									 winlin | c34b0c86e1 | fix #367, support nginx-rtmp exec. 3.0.1 | 2015-08-25 22:29:00 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 28791fd14a | release 2.0alpha0, the 2.0a0, 2.0.185 | 2015-08-23 09:00:21 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 2cf526ffc7 | close #454, support obs restart publish. 2.0.184 | 2015-08-18 17:43:01 +08:00 |  | 
				
					
						| 
								
								
									 winlin | ae37fa8f3e | use send_min_interval for stream control. 2.0.183 | 2015-08-14 11:13:40 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 653afd0700 | merge from 2.0 | 2015-08-12 13:23:00 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 9fb4640a8f | enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182 | 2015-08-12 13:22:09 +08:00 |  | 
				
					
						| 
								
								
									 winlin | b27bb48447 | refine the version | 2015-08-12 08:18:45 +08:00 |  | 
				
					
						| 
								
								
									 winlin | eab538d2e4 | fix the version of srs2 | 2015-08-11 18:37:50 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 0e3128d3e3 | Merge branch '2.0release' into develop | 2015-08-03 15:23:07 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 8d86eb6516 | refine code naming or comments. | 2015-07-28 17:56:50 +08:00 |  | 
				
					
						| 
								
								
									 winlin | c85f92c229 | fix #169, support default values for transcode. 2.0.180 | 2015-07-21 12:07:26 +08:00 |  | 
				
					
						| 
								
								
									 winlin | b54f9b0f94 | refine the hls, ignore packet when no sequence header. 2.0.179 | 2015-07-20 09:31:46 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 366d3a3f56 | for #441, use 30s timeout for first msg. 2.0.178 | 2015-07-16 17:30:27 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 5f77724021 | refine hls disable the time jitter, support not mix monotonically increase. 2.0.177 | 2015-07-14 11:46:23 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 438914c481 | fix #433, fix the sps parse bug. 2.0.176 | 2015-07-01 14:50:45 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 2f44a29b76 | Merge branch '2.0release' into develop | 2015-06-13 16:05:26 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 0d66e92ab5 | refine code, support configure to enable --memory-watch | 2015-06-13 15:45:25 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 56938efdbd | fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175 | 2015-06-10 15:38:13 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 6941f2c072 | fix #424, fix aggregate timestamp bug. 2.0.174 | 2015-06-10 13:53:13 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 00d1fdded0 | Merge branch '2.0release' into develop | 2015-06-08 15:02:30 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 573495a19f | refine the memory watcher. | 2015-06-08 09:47:45 +08:00 |  | 
				
					
						| 
								
								
									 winlin | bb4db61192 | add srs memory watcher. | 2015-06-07 15:12:55 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 223ae194b1 | fix #209, cleanup hls when stop and timeout. 2.0.173. | 2015-05-30 14:41:09 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 5caafadd45 | fix #409: support pure video hls. 2.0.172. | 2015-05-29 21:43:17 +08:00 |  | 
				
					
						| 
								
								
									 winlin | cd162c2848 | merge from 2.0 | 2015-05-25 01:04:04 +08:00 |  | 
				
					
						| 
								
								
									 winlin | d12fc7fcc5 | fix #405, improve the HTTP FLV performance to 6k. 2.0.171 | 2015-05-25 01:02:06 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 4df19ba99a | for #405, improve the http flv to 3k. 2.0.170 | 2015-05-24 23:29:17 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 960341b9b2 | for #405, improve the HTT FLV to 3k. 2.0.169 | 2015-05-24 22:43:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | fc995473eb | for #405, improve the HTTP FLV delivery 1k to 2.3k. 2.0.168 | 2015-05-24 21:17:00 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 069ee0afc3 | fix #404, register handler then start http thread. 2.0.167. | 2015-05-24 15:19:09 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 5908096fc3 | refine the thread, protocol, kbps code. 2.0.166 | 2015-05-23 10:04:28 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 6ca46e84bc | fix #397, the USER_HZ maybe not 100. 2.0.165 | 2015-05-22 17:16:33 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 948d200ce1 | fix #400, parse when got entire http header, by feilong. 2.0.164. | 2015-05-22 12:00:48 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 44bc7976ac | merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163. | 2015-05-19 18:06:20 +08:00 |  | 
				
					
						| 
								
								
									 winlin | c617d2aaa5 | support push flv stream over HTTP POST to SRS. | 2015-05-10 10:35:35 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 91e285b0cd | Merge branch '2.0release' into develop | 2015-04-29 18:46:54 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 4b372d8d16 | change primary to the primary branch. | 2015-04-29 18:46:47 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 94681702e1 | Merge branch '2.0release' into develop | 2015-04-29 18:03:20 +08:00 |  |