3425 Commits (1df1d84766e09b5de51d7fb22e8ebb2432a929e4)

Author	SHA1	Message	Date
winlin	ba4ef34d27	Merge 2.0release	6 years ago
Steven Liu	78cf3d4b58	upgrade x264 and ffmpeg to newest version (#1274) ... The ffmpeg and x264 in srs is too old. Signed-off-by: Steven Liu lq@chinaffmpeg.org Signed-off-by: Steven Liu <lq@chinaffmpeg.org>	6 years ago
winlin	ff82ca1233	Merge branch 2.0release into 3.0release	6 years ago
winlin	99430d2edb	For #1250, Not support macOS 10.14	6 years ago
winlin	24f46f5085	#1261, Support _definst_ for Wowza. 3.0.44	6 years ago
winlin	99aa249f3a	#1261, Support _definst_ for Wowza. 2.0.260	6 years ago
MakarovYaroslav	e62ac29f48	add ignoring _definst_ at the end of app (#1261)	6 years ago
winlin	b2066cbf68	#1263, Fix string trim bug. 2.0.259	6 years ago
MakarovYaroslav	a2480a6c94	fix bug with for loop (#1263)	6 years ago
winlin	39f1629168	Merge from SRS2	6 years ago
winlin	58e501ee24	Fix #1250, Support build on OSX10.14 Mojave. 2.0.258	6 years ago
winlin	63ac93a642	Merge #1236 from 2.0release	6 years ago
winlin	a5b452f965	Merge #1236, Fix sleep bug in us. 2.0.257	6 years ago
RocFang	768fe68ca3	fix st_usleep param from us to ms. (#1236) ... fix st_usleep param from us to ms.	6 years ago
winlin	3f009937ee	Merge #1237 from 2.0release	6 years ago
winlin	9859fa9e6f	Merge #1237, Support param for transcoder. 2.0.256	6 years ago
Mirko Velic	70ad16ff6a	Add request stream param to encoder output format parameters. (#1237)	6 years ago
winlin	8e55ef4b60	Refine code	7 years ago
winlin	1e2cca4712	For #1093, Refine HLS encryption wiki	7 years ago
winlin	5945fb5a24	Fix #1093, Support HLS encryption. 3.0.42	7 years ago
winlin	ee068cf120	For #1109, Support without ssl for HLS key.	7 years ago
winlin	522fba99aa	Merge branch 3.0release into harlanc-3.0release	7 years ago
winlin	e73e30de3a	Fix #1051, Drop ts when republishing stream. 3.0.41	7 years ago
winlin	74d5d15c9f	Merge branch 3.0release of https://github.com/harlanc/srs into harlanc-3.0release	7 years ago
winlin	1e054d2bcc	Fix #354, Rename impl__SrsAutoFree to impl_SrsAutoFree	7 years ago
Harlan	22c5af62cf	Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release ... # Conflicts: # trunk/src/kernel/srs_kernel_utility.hpp	7 years ago
Harlan	bf12a45274	add configuration instructions for hls encryption	7 years ago
Harlan	ac6b37de4b	rewrite ff_data_to_hex	7 years ago
winlin	a9b5d65ca7	For #1202, Support auth_key param for srs player	7 years ago
winlin	728ddd133b	For #1202, Support edge/forward to Aliyun CDN. 3.0.40	7 years ago
winlin	74a87d54f2	For #1202, Support edge/forward to Aliyun CDN. 2.0.255	7 years ago
winlin	1cc72df134	Fix #910, Support HTTP FLV with HTTP callback. 3.0.39	7 years ago
winlin	1e7c12a6dd	For #910, Support HTTP FLV with HTTP callback. 2.0.254	7 years ago
winlin	928c6ab091	For #1181, Add utest	7 years ago
winlin	01d8bba455	For #1181, Refine code to write utest	7 years ago
winlin	6cea551c64	For #1110, Refine params in http callback. 2.0.253	7 years ago
winlin	d607c7f905	Refine HTTP-FLV latency, support realtime mode.3.0.38	7 years ago
winlin	03ac48f8fa	Merge 2.0, for FLV latency	7 years ago
winlin	c45f72ef7b	Refine HTTP-FLV latency, support realtime mode. 2.0.252	7 years ago
winlin	580c94c8c0	Refine code	7 years ago
winlin	31945c244d	For #1110, Refine code.	7 years ago
winlin	455a060fa5	Merge 2.0	7 years ago
winlin	ee43fc92ae	For #1110, Refine conf	7 years ago
winlin	ae99131512	Fix #1087, Ignore iface without address. 3.0.37	7 years ago
winlin	82699ff616	Refine code for librtmp	7 years ago
winlin	29b74c7220	For #1110, Support params in http callback. 3.0.36	7 years ago
winlin	85d3a5001c	For #1110, Support params in http callback. 2.0.251	7 years ago
winlin	68a1656e07	Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35	7 years ago
winlin	09dbda5b18	For #1031, SRS forwarder support douyu.com.	7 years ago
winlin	a66d450ec1	For #1031, SRS edge support douyu.com. 3.0.34	7 years ago
winlin	586899a010	For #1031, SRS edge support douyu.com. 2.0.250	7 years ago
winlin	41c6e833b9	Replace hex to string to match MIT license. 3.0.33	7 years ago
winlin	84f81983aa	Replace base64 to match MIT license. 3.0.32	7 years ago
winlin	0a63448b86	Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31	7 years ago
winlin	e395878916	Replace crc32 IEEE by golang to match MIT license. 3.0.30	7 years ago
winlin	dea5e5bb48	Add utest or CRC32 IEEE, refine TABs of code	7 years ago
winlin	608c88b8f2	Merge 2.0release	7 years ago
winlin	6d7c7418a8	Merge #1119, fix memory leak. 2.0.249	7 years ago
winlin	551863a7ed	Refine code	7 years ago
winlin	693194dffe	Merge 2.0release	7 years ago
winlin	d27db215df	For #1176, should not close fd when success.	7 years ago
winlin	e4742ddac7	Merge 2.0release	7 years ago
winlin	2d49b9d1a7	Merge #1176, fix scaned issues. 2.0.248	7 years ago
Hui Zhang (huzhang2)	01ed485cf3	fix #1172 #1173 #1174 #1175 ... security scan report issue	7 years ago
Harlan	e9cb8210fc	fix default value error	7 years ago
Harlan	45a57acbb4	fix bug	7 years ago
Harlan	43ebd5958d	fix bug that only one stream can be encrypted..	7 years ago
winlin	dba44c7c3f	Merge branch 'develop' into 3.0release	7 years ago
xialixin	bb4e16ae3c	fix create dir success result check (#1080)	7 years ago
xialixin	aaf2905a9d	add: hls configuration adds [duration] variable (#1083)	7 years ago
Harlan	52596a0b04	add HLS encryption feature	7 years ago
winlin	0d78b908a7	Fix client tools resolve dns failed bug	7 years ago
winlin	449c632e49	For #464: Add example for origin cluster	7 years ago
winlin	bd797ad385	Fix utest build failed for ::atoi	7 years ago
winlin	459272b94c	Merge #1077 from 2.0release	7 years ago
winlin	0fe17c3e34	Merge #1077, fix crash for edge HLS. 2.0.247	7 years ago
RocFang	fd016ed91a	use hls->initialize to set req of hls (#1077)	7 years ago
winlin	4bf5ab2044	Fix #464, support RTMP origin cluster. 3.0.29	7 years ago
winlin	c70421e656	Fix #464, support origin cluster	7 years ago
winlin	2f09ec4353	For #464, refine result of origin cluster api	7 years ago
winlin	92f2bcd878	For #464, support config origin cluster	7 years ago
winlin	55c96192e2	For #464, refine code	7 years ago
winlin	ec362b2774	For #464, query origin info and ip addresses	7 years ago
winlin	469250f850	For #464, support origin cluster api	7 years ago
winlin	d0fbf44d18	For #464, support config for origin cluster.	7 years ago
winlin	db6b8cf914	Fix #1057, switch to simple handshake. 3.0.28	7 years ago
winlin	a2cefe4dbd	For #1059, show more information from stream	7 years ago
winlin	681138d2af	Fix #1059, merge from 2.0, supports url with vhost in stream. 3.0.27	7 years ago
winlin	1721e4ea4b	Fix #1059, support vhost in stream parameters. 2.0.246	7 years ago
winlin	93d3e1464a	For #1045, revert macro for TCP keepalive detection, use system macro	7 years ago
winlin	366309ce2d	For #1045, revert macro for TCP keepalive detection, use system macro	7 years ago
winlin	049e7c82c0	Merge #1044, for #1045, set TCP SO_KEEPALIVE	7 years ago
winlin	911cd448f1	Merge #1045, for #1044, TCP connection alive detection. 2.0.245	7 years ago
juntaoliu	a6871052af	set tcp keepalive for tcp socket (#1045)	7 years ago
winlin	82457cda4b	Change date from 2017 to 2018	7 years ago
winlin	ca1395a807	Change date from 2017 to 2018	7 years ago
winlin	d9e37d2f54	Merge branch '2.0release' into 3.0release	7 years ago
RocFang	d22d7afd83	update init.d file (#1039)	7 years ago
winlin	5730bf8e43	Fix #913, support complex error. 3.0.26	7 years ago
winlin	b426036832	Merge #1033, allow user to add some specific flags. 2.0.244	7 years ago