105 commits

Author	SHA1	Message	Date
winlin	ca1395a807	Change date from 2017 to 2018	2018-01-07 10:58:53 +08:00
winlin	204ef041da	For #913, Kernel MP4 FLV HTTP support complex error.	2017-12-31 12:11:48 +08:00
winlin	9802dc326e	For #913, source support complex error	2017-09-23 22:12:33 +08:00
winlin	abcaba33ee	For #913: TS/HLS/MPEGTS support complex error	2017-09-22 21:50:54 +08:00
winlin	7cac35a289	For #913, source cycle error	2017-06-11 09:40:07 +08:00
winlin	c4966484e1	For #893, #899, merge SRS2	2017-05-29 12:17:16 +08:00
OtterWa	d1bd6993c5	fix ts decode (#899)	2017-05-29 12:11:42 +08:00
HungMingWu	234904c206	Refine Refine Refine kernel/ts code (#891)	2017-05-21 09:09:58 +08:00
HungMingWu	e8ea27088a	Refine Refine kernel/ts code (#881)	2017-05-13 09:19:19 +08:00
HungMingWu	815d50f00a	Remove warning: C++11 requires a space between string literal and macro (#874) ... On Ubuntu 17.04, the default gcc compiler version is 6.3.0. It switch standard from c++98 to c++11. So it would generate verbose warnings.	2017-05-06 14:05:22 +08:00
HungMingWu	98d4b6ae11	Refine srs_kernel_codec audio & video config code (#854)	2017-04-24 10:08:57 +08:00
winlin	d6e28bde69	Merge from SRS2.	2017-04-15 17:09:50 +08:00
ME_Kun_Han	bd2a1f9d3c	fixed bug: video rendering in hls stream generates only vertical parttern (#841)	2017-04-15 16:49:02 +08:00
winlin	33375db401	Merge from SRS2, for #834	2017-04-09 18:52:21 +08:00
winlin	b11ddc7f41	Fix #834, crash for TS context corrupt. 2.0.235	2017-04-09 18:45:42 +08:00
winlin	0a57a46016	Refine LICENSE	2017-03-25 21:29:29 +08:00
winlin	f32aab3d92	For #299, refine code.	2017-03-25 17:21:39 +08:00
winlin	ce034c3556	Refine docs, add TURN/STUN rfc.	2017-03-06 10:19:19 +08:00
winlin	2fcd3972c1	for #299, refine the encoder object name	2017-02-12 21:50:02 +08:00
winlin	2a4f57a587	Fix #301, User must config the codec in right way for HLS. 3.0.18	2017-02-12 20:55:35 +08:00
winlin	caf69f193d	for #299, refine the codec object name	2017-02-12 20:38:39 +08:00
winlin	d7458c4e72	For #299, refine the codec to format-frame-sample chain.	2017-02-12 18:18:18 +08:00
winlin	b16ab038ce	for #742, refine the u_intxx_t to uintxx_t	2017-01-30 17:32:18 +08:00
winlin	136a7ef488	for #299, refine docs.	2017-01-26 17:28:49 +08:00
winlin	1ed5118246	refine the spaces, no TABS	2017-01-16 15:47:26 +08:00
winlin	df983cc9ec	fix typo	2017-01-10 18:14:06 +08:00
winlin	a1ae48f4ac	Merge branch '2.0release' into develop	2017-01-10 18:07:52 +08:00
winlin	6fbda2ae3f	for #635, refine hls open/close gop.	2017-01-10 18:07:46 +08:00
winlin	ae1920e91a	Merge branch '2.0release' into develop	2017-01-10 17:17:31 +08:00
winlin	4104f25069	for #635, support IDR and NonIDR(open-gop).	2017-01-10 17:17:23 +08:00
winlin	1dd877c0d6	merge srs2	2017-01-10 11:17:37 +08:00
winlin	c9a71b7fb2	fix #635, hls support NonIDR(open gop). 2.0.226	2017-01-10 11:14:20 +08:00
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	6dfb44b7b5	Merge branch '2.0release' into develop	2016-11-15 10:43:42 +08:00
hankun	e0ab8b080d	fix bug: fix the way calculating PCR for ts(#678)	2016-11-09 10:14:12 +08:00
winlin	2cf077abe9	Merge branch '2.0release' into develop	2016-09-08 18:55:40 +08:00
winlin	80a98cf836	refine annexb parse	2016-09-08 18:55:35 +08:00
winlin	b49cb3d379	Merge branch '2.0release' into develop	2016-08-30 19:30:05 +08:00
winlin	a0890fe06a	comment the pcr	2016-08-30 19:29:59 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	f57e537686	for #515, merge from srs2, use SrsAutoFreeA.	2015-11-02 11:29:20 +08:00
winlin	f4f76cd196	for #515, use SrsAutoFreeA to free the array.	2015-11-02 11:26:37 +08:00
winlin	8cec06e898	merge srs2, use srs_freepa for array	2015-11-02 11:05:39 +08:00
winlin	2af7749771	for #515, use srs_freepa to free the array.	2015-11-02 11:02:27 +08:00
winlin	1d57e53910	merge from 2.0release	2015-10-27 17:45:14 +08:00
winlin	d1979c760f	for #512, partical hotfix the hls pure audio. 2.0.196	2015-10-27 17:44:10 +08:00
winlin	3683f06e4d	for #512, write audio frame by frame for video+audio hls.	2015-10-27 16:20:02 +08:00
winlin	9a47390253	fix #467, support write log to kafka. 3.0.6	2015-10-23 14:42:04 +08:00