| 
								
								
									 winlin | 0f4cb8ee00 | refine code, remove the rtmp recv/send macro, use one macro. | 2015-10-23 14:42:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 12e013142d | refine code, use simple rtmp client. | 2015-10-23 14:42:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | bc27481886 | refine code, use simple rtmp client. | 2015-10-23 14:42:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | e4c852945f | refine code, support override vhost | 2015-10-23 14:42:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | a9ad7b211b | refine simple rtmp client for post flv stream. | 2015-10-23 14:42:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | adb8f243bf | use simple rtmp client for raw connect app | 2015-10-23 14:42:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 24b3899972 | use SrsTcpClient instead raw socket. | 2015-10-23 14:42:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | a9bb6061c3 | use tcp client for raw connect. | 2015-10-23 14:42:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 20fcfb3eee | fix bug, use system utility | 2015-10-23 14:42:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 69cc01b696 | use system utilities | 2015-10-23 14:42:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 908365a61a | use string for const char* | 2015-10-23 14:42:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | d9f991ed2f | use system utility for string finds | 2015-10-23 14:42:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | ca73534d7e | refine comments for api key | 2015-10-23 14:42:01 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 29122b6e70 | fix #502, transcoder support snapshot. | 2015-10-20 14:52:34 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 9eebb89432 | Merge branch '2.0release' into develop | 2015-10-20 10:17:54 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 91e9fc7e5b | fix typo of INVLIAD to INVALID | 2015-10-20 10:17:48 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 57a3b11b86 | merge from srs2 | 2015-10-13 11:48:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 5de65d41f4 | Merge pull request #499 from synote/2.0release fix bug for build failure when configure with --log-info | 2015-10-12 10:07:08 +08:00 |  | 
				
					
						| 
								
								
									 winlin | ed80d9d281 | merge from srs2 | 2015-10-04 08:10:57 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 0c8209cccd | fix #448, fix the bug of response of http hooks. 2.0.195 | 2015-10-04 08:09:39 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 6587c5b2f1 | merge from srs2 | 2015-10-01 13:22:51 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 7811b4f3f7 | fix #497, response error when client not found to kickoff. 2.0.194 | 2015-10-01 13:20:13 +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 | 070ada1d6e | Merge branch '2.0release' into develop | 2015-10-01 12:30:55 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 65e4bf2e77 | fix compile failed bug. | 2015-10-01 12:30:38 +08:00 |  | 
				
					
						| 
								
								
									 winlin | d8f18aee37 | use the right int type for port. | 2015-09-24 18:33:07 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 1c7d5f1852 | Merge branch '2.0release' into develop | 2015-09-24 17:55:33 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 353e3260b8 | remove duplicated code | 2015-09-24 17:55:27 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 9ead08725d | use kernel utility int2str and float2str | 2015-09-24 17:54:58 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 6efd2dd27e | add load balance round robin for brokers. | 2015-09-24 17:20:04 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 2a4ab8a923 | add brokers to config | 2015-09-24 14:53:22 +08:00 |  | 
				
					
						| 
								
								
									 winlin | f187a7deef | refine the startup logs. | 2015-09-24 12:15:12 +08:00 |  | 
				
					
						| 
								
								
									 winlin | afd6428366 | refine code of server. | 2015-09-23 17:21:57 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 396bb43672 | Merge branch '2.0release' into develop | 2015-09-23 15:46:58 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 8b1198562a | show cpu info. | 2015-09-23 15:46:51 +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 | 6990508e58 | for #485, srs for respberrypi and cubieboard. 2.0.191 | 2015-09-23 11:05:56 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 9a9483e7d5 | support without kafka | 2015-09-22 17:46:07 +08:00 |  | 
				
					
						| 
								
								
									 winlin | abb5c5ad31 | add kafka producer | 2015-09-22 17:40:05 +08:00 |  | 
				
					
						| 
								
								
									 winlin | b5ccc35340 | add kafka config | 2015-09-22 15:10:43 +08:00 |  | 
				
					
						| 
								
								
									 winlin | ab1e62a886 | create the metadata request message | 2015-09-22 14:33:17 +08:00 |  | 
				
					
						| 
								
								
									 winlin | ca3b89aa7d | add kafka array, use c++ template. | 2015-09-22 14:09:24 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 2d5cc7a3e4 | add structures for kafka | 2015-09-22 12:38:07 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 83f40697e2 | refine the hpp macro defines. | 2015-09-22 09:15:51 +08:00 |  | 
				
					
						| 
								
								
									 winlin | df6ac8842c | rename rtmp utility to protocol utility | 2015-09-22 09:11:07 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 82ff05c1d4 | rename rtmp io to protocol io | 2015-09-22 09:07:07 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 168625dce2 | rename rtmp amf0 to protocol amf0. | 2015-09-22 09:05:21 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 1310c0f577 | rename srs_protocol_buffer to srs_protocol_stream | 2015-09-22 09:02:37 +08:00 |  |