| 
								
								
									 winlin | 608083d42f | add flv injecter, add flv codec to librtmp. | 2014-05-28 15:37:06 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 009de72a01 | fix research bug, rename srs_freepa to srs_freep | 2014-05-28 10:20:11 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 6de81fdb1c | refine fast id tracer | 2014-05-27 19:34:18 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 384687a36d | add server ip to flash client. | 2014-05-27 16:17:40 +08:00 |  | 
				
					
						| 
								
								
									 winlin | e39eed6519 | add SrsPid and SrsId to client response, add pid to log | 2014-05-27 16:11:25 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 5ff1ce7cba | for bug #87, response the server SrsId to flash. | 2014-05-27 15:34:55 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 14f0a2e046 | for bug #88, add timeout for connect. | 2014-05-26 18:21:35 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 93c9c55fb9 | remove the complex handshake of librtmp. refine makefile of librtmp tools | 2014-05-26 15:54:39 +08:00 |  | 
				
					
						| 
								
								
									 winlin | b13bd70c86 | http streaming support flv start index. | 2014-05-26 13:57:08 +08:00 |  | 
				
					
						| 
								
								
									 winlin | cf7b6f25f6 | add srs community | 2014-05-23 22:39:13 +08:00 |  | 
				
					
						| 
								
								
									 winlin | bd24fe7d75 | support flv parser, add amf0 to librtmp. 0.9.110 | 2014-05-22 15:08:25 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 69eb935505 | fix bug of flv parser, librtmp amf0 library | 2014-05-22 11:39:10 +08:00 |  | 
				
					
						| 
								
								
									 winlin | d4b8fee61a | fix bug #73, http callback api support authentication in tcUrl | 2014-05-22 10:23:12 +08:00 |  | 
				
					
						| 
								
								
									 winlin | f37faf7236 | update librtmp, add amf0 parse functions | 2014-05-21 18:30:58 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 2a8db3ab83 | refine the re of ingest flv, re cleanup always sleep | 2014-05-21 09:31:38 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 1d6b096ce9 | adjust the deviation. | 2014-05-20 18:15:02 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 2265173c4d | donot install tools when ffmpeg is not open, 0.9.108 | 2014-05-20 18:11:33 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 7c804277b2 | add heatbeat url, add stream for api-server | 2014-05-19 15:27:05 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 07fbd58f39 | update api server, add meiyi demo streams. | 2014-05-16 10:52:38 +08:00 |  | 
				
					
						| 
								
								
									 winlin | add64533e3 | add donation user chen.chen | 2014-05-12 10:36:37 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 1c1efd7000 | update readme, update api server stream list | 2014-05-10 14:01:40 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 8388da6325 | add miss files. fix bug #60: support aggregate message | 2014-05-08 14:33:25 +08:00 |  | 
				
					
						| 
								
								
									 winlin | b2aab8804b | use complex handshake for srs play | 2014-05-08 11:48:34 +08:00 |  | 
				
					
						| 
								
								
									 winlin | f5f29e486f | update code stat | 2014-05-07 13:19:25 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 5e806d62bb | add code statistic tool | 2014-05-07 11:07:10 +08:00 |  | 
				
					
						| 
								
								
									 winlin | ae372de65e | merge from wukong, fix the bug of build x264 on minimal server | 2014-05-06 13:51:38 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 90e50da305 | update api server, add hiwifi | 2014-05-05 18:07:06 +08:00 |  | 
				
					
						| 
								
								
									 winlin | e5290725ab | fix bug of mips | 2014-05-04 19:13:21 +08:00 |  | 
				
					
						| 
								
								
									 winlin | e3be7bfa88 | disable detail log | 2014-04-30 12:22:06 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 30bb3ff704 | add dvr_plan hss to full.conf | 2014-04-30 11:56:19 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 0f498acd7b | add comments and variable for c3 extended-timestamp. to 0.9.82 | 2014-04-29 18:16:29 +08:00 |  | 
				
					
						| 
								
								
									 winlin | e5720d3906 | fix bug of research librtmp tools | 2014-04-28 19:05:24 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 241d04b391 | update api server for android server vhost changed | 2014-04-28 14:54:27 +08:00 |  | 
				
					
						| 
								
								
									 winlin | e271cb607f | refine plan, add stream start time for atc | 2014-04-23 17:53:14 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 09901d31da | fix bug of android api server, fix the dead loop | 2014-04-23 13:19:08 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 580cbb84a9 | add threading.Lock for cherrypy, or performance suffer. | 2014-04-23 12:17:22 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 6f984ff54b | fix bug of raspberry-pi build, static off | 2014-04-21 15:17:45 +08:00 |  | 
				
					
						| 
								
								
									 winlin | a158d81085 | update raspberry-pi demo api | 2014-04-21 13:47:32 +08:00 |  | 
				
					
						| 
								
								
									 winlin | b5b5202ed2 | update cdn api server. | 2014-04-21 10:40:30 +08:00 |  | 
				
					
						| 
								
								
									 winlin | b85e667991 | update api, select the lowest load of peer | 2014-04-21 09:11:08 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 87bdaa21c9 | add nodes for api | 2014-04-21 00:03:17 +08:00 |  | 
				
					
						| 
								
								
									 winlin | dcb9941ed7 | add hls api to api-server | 2014-04-20 15:00:34 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 4c5aae7804 | fix bug of ingest for android, init the variable to 0 | 2014-04-19 12:49:15 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 5c8aad4fe4 | fix bug of ingest for android, init the variable to 0 | 2014-04-19 12:49:05 +08:00 |  | 
				
					
						| 
								
								
									 winlin | c530a8e5fc | fix bug of ingest for android, init the variable to 0 | 2014-04-19 12:47:16 +08:00 |  | 
				
					
						| 
								
								
									 winlin | e42eef422f | add ssl and nossl for ingest flv/rtmp over srs-librtmp | 2014-04-19 11:40:46 +08:00 |  | 
				
					
						| 
								
								
									 winlin | e5fcf80b94 | refine ingest flv over srs-librtmp | 2014-04-19 11:24:31 +08:00 |  | 
				
					
						| 
								
								
									 winlin | b1835ee2fe | add ingest flv to RTMP over srs-librtmp | 2014-04-19 11:19:26 +08:00 |  | 
				
					
						| 
								
								
									 winlin | f17f5de7d1 | ingest rtmp to rtmp by srs-librtmp | 2014-04-19 10:30:40 +08:00 |  | 
				
					
						| 
								
								
									 winlin | 608b28f223 | add srs ingest flv/rtmp base on srs-librtmp | 2014-04-19 09:47:47 +08:00 |  |