4086 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
winlin	711b58e0b2	Merge pull request #763 from HungMingWu/develop ... Replace ffmpeg version from 2.1.1 to 3.2.4	2017-02-18 14:04:39 +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	292f62ab0f	Update the wiki links	2017-02-11 14:13:55 +08:00
winlin	fdd81fa886	Update index	2017-02-11 14:03:13 +08:00
winlin	af0d98619a	Merge srs2	2017-02-11 13:55:45 +08:00
winlin	1cf24905ce	Update 2.0 wikis	2017-02-11 13:54:17 +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	ebc1be913f	Merge branch '2.0release' into develop	2017-02-10 13:15:51 +08:00
winlin	605192f448	add wechat link	2017-02-10 13:14:29 +08:00
winlin	72ceeaf2ff	Merge branch '2.0release' into develop	2017-02-10 12:54:55 +08:00
winlin	8d60318378	add wechat link	2017-02-10 12:54:04 +08:00
winlin	dd1929c7a1	add wechat link	2017-02-10 12:49:06 +08:00
winlin	e2d85d099e	update readme for DVR mp4	2017-02-09 15:43:40 +08:00
winlin	00abaf4df2	merge srs2, remove donation	2017-02-09 15:42:42 +08:00
winlin	455d9b285e	remove donation	2017-02-09 15:41:45 +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	61d8ca7e70	merge srs2	2017-02-09 13:56:54 +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
winlin	4fe79a1025	for #738, fix the audio sample offset error.	2017-02-05 20:27:37 +08:00
winlin	733252dc21	for #738, remove test code	2017-02-05 09:23:38 +08:00
winlin	733ba73d54	for #738, write mp4 samples.	2017-02-05 09:15:46 +08:00
winlin	e24674e9cf	for #738, refine build mp4 samples from moov.	2017-02-04 22:45:52 +08:00
winlin	3025aebf42	for #738, mp4 build samples from moov.	2017-02-04 22:25:03 +08:00
winlin	253ac40312	for #738, parse avcc/sps/pps/asc from mp4.	2017-02-04 14:57:07 +08:00
winlin	9d21a8bb33	for #738, use reader and seeker for mp4 demuxer to seek for general mp4(ftyp-mdat-moov).	2017-02-03 22:49:19 +08:00
winlin	bbee16e4db	for #738, parse moov, get the h.264/avcC and aac/asc	2017-02-03 21:03:26 +08:00
winlin	e8eb050bf2	update readme	2017-02-03 14:57:28 +08:00