5266 Commits (e2233027b83c16818363e21401acb4049853a0ee)

 

All Branches   

Search

Author	SHA1	Message	Date
winlin	ef3e35f173	Fix build warning	6 years ago
winlin	4d157f2148	Fix build warning	6 years ago
winlin	dcc2a73e7a	Refine kernel aac	6 years ago
winlin	572a2806c1	Refine utest	6 years ago
winlin	a8be5f8f27	Allow OSX for utest	6 years ago
winlin	f2a93755c2	Allow OSX for utest	6 years ago
winlin	f1033296bb	Upgrade to FFMPEG 4.1 and X264 157. 2.0.261	6 years ago
winlin	acaae0d5c9	Update SRS3	6 years ago
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	4cb8de3029	Release r2.0r5, 2.0.258	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	580b94c9c8	SRS console support both Chinese and English	7 years ago
winlin	8e55ef4b60	Refine code	7 years ago
winlin	1e2cca4712	For #1093, Refine HLS encryption wiki	7 years ago
winlin	37bc0a253d	Merge branch harlanc-3.0release into 3.0release	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	a61bfb2066	Merge 2.0r4	7 years ago
winlin	36cebc4b71	Release 2.0r4, 2.0.255	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	c582590bb0	For #1110, Refine params in http callback. 2.0.253	7 years ago
winlin	6cea551c64	For #1110, Refine params in http callback. 2.0.253	7 years ago