winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								f6252c7f72
								
							
						 | 
						
							
							
								
								enable hls for push flv.
							
							
							
							
							
						 | 
						
							2015-05-07 11:07:32 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								ffdabf32ed
								
							
						 | 
						
							
							
								
								add push flv conf
							
							
							
							
							
						 | 
						
							2015-05-05 11:44:20 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								f0c24eeacc
								
							
						 | 
						
							
							
								
								add stream caster for post flv over http.
							
							
							
							
							
						 | 
						
							2015-05-03 10:56:20 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								115daa3cc1
								
							
						 | 
						
							
							
								
								migarate from winlinvip to srs org
							
							
							
							
							
						 | 
						
							2015-04-29 17:06:32 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								0acb942c3a
								
							
						 | 
						
							
							
								
								update on_hls, add ts_url, m3u8 and m3u8_url.
							
							
							
							
							
						 | 
						
							2015-04-23 12:05:24 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								22ca46350b
								
							
						 | 
						
							
							
								
								fix #383, support mix_correct algorithm. 2.0.161.
							
							
							
							
							
						 | 
						
							2015-04-15 17:12:22 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								8fbc6526bb
								
							
						 | 
						
							
							
								
								for #383, refine code to support mix correct algorithm.
							
							
							
							
							
						 | 
						
							2015-04-15 16:17:52 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								02a2cb7e1a
								
							
						 | 
						
							
							
								
								for #381, refine the hls notify, report one by one.
							
							
							
							
							
						 | 
						
							2015-04-14 11:36:58 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								dcac9c69d5
								
							
						 | 
						
							
							
								
								fix #381, support reap hls/ts by gop or not. 2.0.160.
							
							
							
							
							
						 | 
						
							2015-04-13 10:32:32 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								5d37e47783
								
							
						 | 
						
							
							
								
								support config the hls_nb_notify.
							
							
							
							
							
						 | 
						
							2015-04-10 14:44:18 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								e3c6e52547
								
							
						 | 
						
							
							
								
								enhanced on_hls_notify, support HTTP GET when reap ts.
							
							
							
							
							
						 | 
						
							2015-04-10 12:01:45 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								e458305f81
								
							
						 | 
						
							
							
								
								add utc time format.
							
							
							
							
							
						 | 
						
							2015-04-03 16:42:32 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								64b065e450
								
							
						 | 
						
							
							
								
								for hls callback, add duration of ts.
							
							
							
							
							
						 | 
						
							2015-04-03 13:46:44 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								17c0a5c470
								
							
						 | 
						
							
							
								
								fix #372, support transform vhost of edge 2.0.155.
							
							
							
							
							
						 | 
						
							2015-04-03 10:56:56 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								8401d9ac06
								
							
						 | 
						
							
							
								
								fix #366, config hls to disable cleanup of ts. 2.0.154.
							
							
							
							
							
						 | 
						
							2015-04-02 11:52:03 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								76c1957260
								
							
						 | 
						
							
							
								
								enhance hls, increase piece one by one.
							
							
							
							
							
						 | 
						
							2015-03-31 16:58:20 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								f6e135943f
								
							
						 | 
						
							
							
								
								enhanced hls, support deviation for duration. 2.0.151.
							
							
							
							
							
						 | 
						
							2015-03-31 15:39:47 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								692b751da8
								
							
						 | 
						
							
							
								
								for #351, support config the m3u8/ts path for hls. 2.0.149.
							
							
							
							
							
						 | 
						
							2015-03-30 12:44:04 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								b6feb0742f
								
							
						 | 
						
							
							
								
								fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148
							
							
							
							
							
						 | 
						
							2015-03-23 23:13:57 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								fcab17741c
								
							
						 | 
						
							
							
								
								fix #222, the dvr path rule changed.
							
							
							
							
							
						 | 
						
							2015-03-23 22:06:18 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								0319e85f99
								
							
						 | 
						
							
							
								
								support config the audio overflow ratio.
							
							
							
							
							
						 | 
						
							2015-03-19 17:24:27 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								2241ba0e34
								
							
						 | 
						
							
							
								
								for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142
							
							
							
							
							
						 | 
						
							2015-03-17 07:57:58 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									wenjie.zhao
								
							 
						 | 
						
							
							
							
							
								
							
							
								65f404fb42
								
							
						 | 
						
							
							
								
								for #340, refine ts prefix code.
							
							
							
							
							
						 | 
						
							2015-03-13 02:01:24 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									wenjie.zhao
								
							 
						 | 
						
							
							
							
							
								
							
							
								5969f72354
								
							
						 | 
						
							
							
								
								for #340, refine ts prefix code.
							
							
							
							
							
						 | 
						
							2015-03-13 01:32:51 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									wenjie.zhao
								
							 
						 | 
						
							
							
							
							
								
							
							
								10da182853
								
							
						 | 
						
							
							
								
								add hls prefix of uri supported
							
							
							
							
							
						 | 
						
							2015-03-13 00:22:55 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								59d9af8039
								
							
						 | 
						
							
							
								
								update conf
							
							
							
							
							
						 | 
						
							2015-03-15 19:34:04 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								6d15d0ea99
								
							
						 | 
						
							
							
								
								for #324, refine code, add hstrs config.
							
							
							
							
							
						 | 
						
							2015-03-14 09:52:47 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								ffef62900f
								
							
						 | 
						
							
							
								
								for #328, support adobe hds. 2.0.138.
							
							
							
							
							
						 | 
						
							2015-03-12 11:15:15 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									wenjie.zhao
								
							 
						 | 
						
							
							
							
							
								
							
							
								e57bda8908
								
							
						 | 
						
							
							
								
								Merge code.
							
							
							
							
							
							
							
							Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp 
							
						 | 
						
							2015-03-11 14:18:09 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								5370493140
								
							
						 | 
						
							
							
								
								add ingest to mac.dev conf.
							
							
							
							
							
						 | 
						
							2015-03-11 13:24:14 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								0ff49fd299
								
							
						 | 
						
							
							
								
								for #155, debug srs on xcode.
							
							
							
							
							
						 | 
						
							2015-03-10 13:13:31 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								b0953c1d3a
								
							
						 | 
						
							
							
								
								add comments of audio profile supported by srs.
							
							
							
							
							
						 | 
						
							2015-03-08 20:02:43 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								b360fe279d
								
							
						 | 
						
							
							
								
								remove libaacplus.
							
							
							
							
							
						 | 
						
							2015-03-06 22:35:02 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								5d0cb7e68f
								
							
						 | 
						
							
							
								
								update conf for rtsp
							
							
							
							
							
						 | 
						
							2015-03-01 21:24:01 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								012c29e124
								
							
						 | 
						
							
							
								
								for #133, update the wiki.
							
							
							
							
							
						 | 
						
							2015-03-01 21:08:44 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								fb3fced8d0
								
							
						 | 
						
							
							
								
								for #179, revert dvr http api. 2.0.128.
							
							
							
							
							
						 | 
						
							2015-03-01 17:57:28 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								0213cc6466
								
							
						 | 
						
							
							
								
								for #179, refine dvr, support POST create dvr when publish not start. 2.0.126
							
							
							
							
							
						 | 
						
							2015-02-27 20:39:36 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								b903a7b436
								
							
						 | 
						
							
							
								
								for #179, dvr suport vhost/app/stream level control. 2.0.125.
							
							
							
							
							
						 | 
						
							2015-02-25 09:20:11 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								a3648063d5
								
							
						 | 
						
							
							
								
								fix #179, support dvr http api. 2.0.123.
							
							
							
							
							
						 | 
						
							2015-02-24 17:29:30 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								d650118988
								
							
						 | 
						
							
							
								
								fix #179, dvr support api to start or stop. 2.0.123
							
							
							
							
							
						 | 
						
							2015-02-23 19:23:32 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								1246989ea9
								
							
						 | 
						
							
							
								
								for #179, refine dvr, support callback when reap dvr segment.
							
							
							
							
							
						 | 
						
							2015-02-22 10:45:13 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								849e59b05d
								
							
						 | 
						
							
							
								
								for #179, support http api to start dvr.
							
							
							
							
							
						 | 
						
							2015-02-21 23:09:21 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								c67a4fdf97
								
							
						 | 
						
							
							
								
								for #179, enable http api crossdomain for dvr api.
							
							
							
							
							
						 | 
						
							2015-02-21 21:17:59 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								7077b74d03
								
							
						 | 
						
							
							
								
								for #179, add dvr plan append.
							
							
							
							
							
						 | 
						
							2015-02-21 16:52:37 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								95b4baee7c
								
							
						 | 
						
							
							
								
								for #179, refine dvr code to more simple.
							
							
							
							
							
						 | 
						
							2015-02-21 16:25:04 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								a984eeecab
								
							
						 | 
						
							
							
								
								refine dvr, append file when dvr file exists. 2.0.122.
							
							
							
							
							
						 | 
						
							2015-02-19 19:50:10 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								1102c7a58f
								
							
						 | 
						
							
							
								
								refine pithy print to more easyer to use 2.0.121.
							
							
							
							
							
						 | 
						
							2015-02-19 18:56:21 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								40fbfd8560
								
							
						 | 
						
							
							
								
								for #133, rtsp extract tcp/udp listener.
							
							
							
							
							
						 | 
						
							2015-02-17 16:28:28 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								c0e50265bd
								
							
						 | 
						
							
							
								
								for #133, create rtsp framework.
							
							
							
							
							
						 | 
						
							2015-02-16 14:05:01 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									winlin
								
							 
						 | 
						
							
							
							
							
								
							
							
								e81e090239
								
							
						 | 
						
							
							
								
								for #133, add rtsp listener and handler.
							
							
							
							
							
						 | 
						
							2015-02-15 21:28:31 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |