| 
								
								
									 winlin | f1e7e9d933 | support gmd. change work_dir. hourglass. add utilies. | 2016-01-08 13:58:19 +08:00 |  | 
				
					
						| 
								
								
									 winlin | d0c74fa7cd | update 2015 to 2016 | 2015-12-23 11:35:40 +08:00 |  | 
				
					
						| 
								
								
									 winlin | b2ae1acaa4 | copy http-parser-2.1 into srs http stack. | 2015-12-07 11:35:05 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 44b26271bf | Merge branch '2.0release' into develop | 2015-11-11 17:12:34 +08:00 |  | 
				
					
						| 
								
								
									 winlin | c4c63f7825 | fix build failed bug for osx. | 2015-11-11 17:06:12 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 01c46bdbfd | rename org simle-rtmp-server to ossrs | 2015-11-11 10:45:45 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 1ffd5fd455 | rename org simple-rtmp-server to ossrs | 2015-11-11 10:37:50 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 6df4d1f05a | merge from srs2. | 2015-11-05 15:12:49 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 98e25def6c | fix utest build failed for osx. | 2015-11-05 15:11:59 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 11979229e6 | Merge branch '2.0release' into develop | 2015-10-26 13:34:44 +08:00 |  | 
				
					
						| 
								
								
									 winlin | e08beba89e | fix the sed command for arm | 2015-10-26 13:34:28 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 45385241bb | fix the sed command for arm | 2015-10-26 13:29:59 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 8862ec1988 | merge from srs2 | 2015-10-01 13:05:25 +08:00 |  | 
				
					
						| 
								
								
									 winlin | a3c229472e | fix #495, decrease the srs-librtmp size. 2.0.193 | 2015-10-01 13:04:28 +08:00 |  | 
				
					
						| 
								
								
									 winlin | f187a7deef | refine the startup logs. | 2015-09-24 12:15:12 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 4e88262512 | merge from srs2 to check cpus. | 2015-09-23 15:11:33 +08:00 |  | 
				
					
						| 
								
								
									 winlin | cfe2082353 | fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192 | 2015-09-23 15:09:59 +08:00 |  | 
				
					
						| 
								
								
									 winlin | f6e655396c | for #485, support cross build for arm | 2015-09-23 11:54:53 +08:00 |  | 
				
					
						| 
								
								
									 winlin | d94a88a797 | merge from srs2 for pi and cubie. | 2015-09-23 11:23:55 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 16730ea031 | refine code for cross build | 2015-09-23 11:21:51 +08:00 |  | 
				
					
						| 
								
								
									 winlin | f75058413d | Merge branch '2.0release' into develop | 2015-09-23 10:39:24 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 7dcdb18588 | support build on pi and cubie | 2015-09-23 10:27:57 +08:00 |  | 
				
					
						| 
								
								
									 winlin | a8829e0a8b | support build on pi or cubie. | 2015-09-23 10:22:58 +08:00 |  | 
				
					
						| 
								
								
									 winlin | abb5c5ad31 | add kafka producer | 2015-09-22 17:40:05 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 8a6edac4e8 | add --x86-64 alias for --x86-x64. | 2015-09-22 13:52:14 +08:00 |  | 
				
					
						| 
								
								
									 winlin | edead21a25 | refine the options | 2015-09-22 12:51:29 +08:00 |  | 
				
					
						| 
								
								
									 winlin | e415824576 | refine the options | 2015-09-22 12:43:22 +08:00 |  | 
				
					
						| 
								
								
									 winlin | e4e36a0166 | merge from srs2, fix openssl build | 2015-09-21 12:03:47 +08:00 |  | 
				
					
						| 
								
								
									 winlin | d8a64aaab5 | fix #484, hotfix the openssl build script 2.0.190 | 2015-09-21 12:01:48 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 7b2b11e932 | async call worker fast execute tasks. | 2015-09-17 11:57:17 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 087f7740b7 | fix the build failed bug | 2015-09-17 11:41:23 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 256459e1ec | fix the utest bug | 2015-09-17 11:37:35 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 0d66e92ab5 | refine code, support configure to enable --memory-watch | 2015-06-13 15:45:25 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 1f1776a0d8 | fix the export project bug. wakeup connection when dispose server. | 2015-06-09 14:38:05 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 969ed7b0ae | refine build summary. | 2015-06-09 11:51:40 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 7996b3b789 | add warning for gmp, use gmc to detect memory leak. | 2015-06-09 10:52:32 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 574cf6a094 | use libfdk_aac for srs2. | 2015-06-08 15:02:19 +08:00 |  | 
				
					
						| 
								
								
									 winlin | fec8422d6b | fix bug of configure. | 2015-05-27 10:23:40 +08:00 |  | 
				
					
						| 
								
								
									 winlin | a45cf38d44 | auto detect the sed command for osx. | 2015-05-24 14:52:37 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 7fc1cda392 | add stream status to api. | 2015-05-08 16:45:25 +08:00 |  | 
				
					
						| 
								
								
									 winlin | b23e196f20 | migarate from winlinvip to srs org, move the copyright to srs org. | 2015-04-29 17:38:23 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 115daa3cc1 | migarate from winlinvip to srs org | 2015-04-29 17:06:32 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 2239e9f1fd | support ingest hls live stream to RTMP. | 2015-04-20 16:25:48 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 1cb2992808 | refine build for modules, add defines. | 2015-03-23 17:49:45 +08:00 |  | 
				
					
						| 
								
								
									 winlin | cf3becbc17 | for #155, osx(darwin) enable http api and stat, rusage is ok. | 2015-03-17 22:35:47 +08:00 |  | 
				
					
						| 
								
								
									 winlin | a28c051c2c | osx support build nginx and ffmpeg | 2015-03-17 21:51:19 +08:00 |  | 
				
					
						| 
								
								
									 winlin | f3e5431d0f | check what a fuck os for some fresh. | 2015-03-17 21:12:30 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 33e579599c | refine build for osx | 2015-03-16 22:25:59 +08:00 |  | 
				
					
						| 
								
								
									 Nimrod A. Abing (on kohima) | bc93147426 | for #308, disable st examples. for #334, refine the st init and event select. | 2015-03-16 15:35:01 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 6d15d0ea99 | for #324, refine code, add hstrs config. | 2015-03-14 09:52:47 +08:00 |  |