4164 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
winlin	ac7ee10b60	fix #751,#756, refine code	2017-02-03 11:56:02 +08:00
winlin	f15fb27745	Merge pull request #756 from eagle-zhang/develop ... Clients Api support start and count	2017-02-03 11:51:13 +08:00
Chengdong Zhang	80540e4dc1	change TAB space ... change TAB space for line 794	2017-02-03 10:58:32 +08:00
eagle-zhang	7b02e3543f	Clients Api support start and count ... Clients Api support start and count line 794~810 && line 830	2017-02-03 10:49:06 +08:00
winlin	7ee1df33d1	for #738, parse mp4 udta(user data) box.	2017-02-02 22:20:33 +08:00
winlin	ffe0a4426d	for #738, parse mp4 moov boxes.	2017-02-02 22:02:39 +08:00
winlin	96f2e18d3a	for #738, demux the aac mp4a and esds	2017-02-02 19:05:08 +08:00
winlin	128a1fd3db	for #738, decode mp4 video track boxes.	2017-02-02 15:10:11 +08:00
winlin	5a84b6ca94	for #738, complete all mp4 boxes codec.	2017-02-02 12:36:48 +08:00
winlin	2ad265bd5a	for #738, implements boxes codec	2017-02-01 21:57:32 +08:00
winlin	b6bb3f2446	fix c99 build failed.	2017-01-31 22:17:27 +08:00
winlin	858951da49	for #738, add srs ingest mp4	2017-01-31 21:36:51 +08:00
winlin	34a8eb6113	for #738, add srs ingest mp4 tool	2017-01-31 20:43:48 +08:00
winlin	33ba6cdee2	change utest when demuxer use io interface.	2017-01-30 20:58:32 +08:00
winlin	01d401c270	for #738, refine flv codec to use io interface.	2017-01-30 20:12:36 +08:00
winlin	d3bb8b6a86	for #742, refine the io interfaces.	2017-01-30 19:59:59 +08:00
winlin	eaa222f034	for #742, refine the file reader and writer interface.	2017-01-30 19:35:04 +08:00
winlin	bb5bd0ee1c	include for uintxx_t	2017-01-30 17:38:30 +08:00
winlin	b16ab038ce	for #742, refine the u_intxx_t to uintxx_t	2017-01-30 17:32:18 +08:00
winlin	011ac4f6a9	for #738, add mp4 demuxer to librtmp	2017-01-30 17:19:07 +08:00
winlin	3f3e98e9db	for #738, major boxes from isom	2017-01-29 17:16:20 +08:00
winlin	8588a10775	Merge branch '2.0release' into develop	2017-01-29 17:15:43 +08:00