3146 commits

Author	SHA1	Message	Date
winlin	16cde27a1e	Remove MacOS compile option, for it's on use. It's caused by paralell make	2017-03-01 12:39:42 +08:00
winlin	121a2e5886	For #110, refine thread object. 3.0.19	2017-03-01 12:28:32 +08:00
winlin	44014683e1	Refine thread.	2017-03-01 12:23:44 +08:00
winlin	5bec6a4fdd	Refine srs-librtmp	2017-03-01 12:03:49 +08:00
winlin	011b693235	Update srs-librtmp, set errno to ret when failed.	2017-03-01 11:00:54 +08:00
winlin	72c4ae4a8c	Refine srs-librtmp API, change print to format	2017-03-01 10:52:57 +08:00
winlin	ad87bd7cf2	Refine configure	2017-03-01 09:21:20 +08:00
winlin	68a5407b3a	Remove using of connect_app2.	2017-02-28 20:35:56 +08:00
winlin	26c20db2b3	Fix parse srs version bug	2017-02-28 20:03:46 +08:00
winlin	c849010fe2	Refine api for srs-librtmp	2017-02-28 19:46:09 +08:00
winlin	af73e8ee65	Add log functions for srs-librtmp	2017-02-28 16:19:54 +08:00
winlin	ca43bfe6d9	Fix build failed, for srs librtmp API changed.	2017-02-28 14:54:53 +08:00
winlin	cdfded6a74	Support disable valgrind	2017-02-28 14:47:00 +08:00
winlin	89a5fa69d1	Refine srs-librtmp, set the schema, rather that connect app3	2017-02-28 14:07:14 +08:00
winlin	4e96c443d8	Change the bool to int for C	2017-02-27 17:39:29 +08:00
winlin	747d6f2f52	For #299, write legal MPD, fix CORS.	2017-02-26 21:45:08 +08:00
winlin	8ab727f3c5	For #299, write MPD file.	2017-02-26 20:40:33 +08:00
HungMingWu	a6582c6208	Disable openssl thread support to prevent ubuntu linking pthread error	2017-02-25 09:47:29 +00:00
winlin	764cf245e9	For #774, build librtmp exmaples failed for -lpthread	2017-02-25 12:13:12 +08:00
winlin	ac0e27b936	For #774, refine code style	2017-02-25 12:10:41 +08:00
HungMingWu	01d5e4da17	Replace openssl from l-1.0.1f to 1.10e (#774) ... DUe to API breakchange, add a wrapper for backward compatibility	2017-02-25 12:06:39 +08:00
winlin	695ceeab48	Refine code for #777	2017-02-25 11:30:25 +08:00
Chengdong Zhang	a3df4e3bfb	Fix #744 http callback set a wrong default port (#777) ... * Add port verify Code is more robust * Verify port Verify port * Change hard code to defined. Change hard code to defined.	2017-02-25 11:28:59 +08:00
winlin	d786d61685	Merge branch '2.0release' into develop	2017-02-25 11:21:56 +08:00
winlin	0059b1cf7a	For #783, use directly free to replace auto free	2017-02-25 11:18:54 +08:00
ljx0305	b0d16840b5	fix Repeated release (#783) ... fix Repeated release	2017-02-25 11:15:27 +08:00
winlin	cee9d736a4	for #299, refine code.	2017-02-19 22:03:51 +08:00
winlin	ede1c34a25	for #299, refine the signature of api for hls/dash	2017-02-19 21:48:32 +08:00
HungMingWu	33d6274217	Replace ffmpeg version from 2.1.1 to 3.2.4	2017-02-13 23:29:39 +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	d612a21bad	for #299, refine audio codec object name	2017-02-12 20:46:24 +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	c4a510b834	For #299, refine the codec info structure.	2017-02-11 23:09:23 +08:00
winlin	5e419c66f8	For #299, add dash files.	2017-02-11 21:14:28 +08:00
winlin	7fd221ef63	Always enable DVR	2017-02-11 17:27:40 +08:00
winlin	b0789c54e4	Update HLS wiki to v3	2017-02-11 14:28:40 +08:00
winlin	8e5d4dc73d	always enable http and hls	2017-02-11 13:29:53 +08:00
winlin	11e8fe5bc0	refine options, remove rtmp-hls	2017-02-11 12:45:49 +08:00
winlin	477414106a	add dash files.	2017-02-11 12:30:21 +08:00
winlin	5fec59ace2	merge from srs2, fix #503	2017-02-09 14:33:56 +08:00
winlin	99bffea328	fix #503, disable utilities when reload a source. 2.0.233	2017-02-09 14:29:57 +08:00
winlin	15570d93ce	change conf to console without daemon.	2017-02-09 14:17:36 +08:00
winlin	90ff579a83	add gitignore.	2017-02-09 13:56:04 +08:00
winlin	afbc3443f3	fix #738, support DVR general mp4. 3.0.17	2017-02-07 21:56:20 +08:00
winlin	3209ad29e0	for #738, refine code for DVR mp4.	2017-02-06 20:58:52 +08:00
winlin	0a054cd6bd	for #738, remove the dvr plan append for it's no use	2017-02-06 20:22:07 +08:00
winlin	8c01f52372	for #738, refine the dvr segmenter.	2017-02-06 18:33:26 +08:00
winlin	31191f2650	for #738, support srs ingest mp4	2017-02-05 21:22:07 +08:00