4295 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	2677ec8c3f	Update license mixing	2017-05-24 14:14:45 +08:00
winlin	1e3550a52c	For #821, Parse basic mp4 boxes.	2017-05-21 19:41:15 +08:00
HungMingWu	234904c206	Refine Refine Refine kernel/ts code (#891)	2017-05-21 09:09:58 +08:00
winlin	dd1cca45cc	Remove non-exists conf file.	2017-05-18 14:00:04 +08:00
winlin	eaccbd0f85	Support print MP4 box.	2017-05-14 22:16:15 +08:00
winlin	fe43a31d06	Parse all mp4 boxes	2017-05-13 22:37:46 +08:00
winlin	366d6bcb82	Refine code	2017-05-13 21:47:20 +08:00
xialixin	92c8c0505d	Fix the timebase bug, change from us to ms. (#876) ... * fix SRS_CONSTS_RTMP_PULSE_TMMS (int64_t)(500*1000LL) * fix SrsBufferCache::cycle st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000) * fix st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000)	2017-05-13 09:21:02 +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
winlin	a58874178b	Fix merge build failed.	2017-05-01 16:49:09 +08:00
winlin	f97260be1d	Merge SRS2	2017-05-01 16:44:14 +08:00
winlin	a613eb78c6	Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242	2017-05-01 16:39:59 +08:00
walkermi	79e4f9f3a0	fixed compile error when add --log-info (#860) ... * Update srs_app_server.cpp fixed compile error when add --log-info * Update srs_app_mpegts_udp.cpp fixed compile error when add --log-info	2017-04-30 12:29:37 +08:00
winlin	ae5450181c	Fix #636, FD leak for requesting empty HTTP stream. 2.0.241	2017-04-30 12:03:31 +08:00
HungMingWu	98d4b6ae11	Refine srs_kernel_codec audio & video config code (#854)	2017-04-24 10:08:57 +08:00
winlin	c97f2233a2	Merge SRS2 for #851	2017-04-23 21:00:06 +08:00
winlin	ff87318b95	Fix #851, HTTP API support number of video frames for FPS. 2.0.240	2017-04-23 20:55:51 +08:00
winlin	d0bf47906d	Merge SRS2	2017-04-18 21:11:36 +08:00
winlin	4167715153	Release 2.0r1, 2.0.239	2017-04-18 21:08:31 +08:00
winlin	d15c21a034	Merge branch '2.0release' into develop	2017-04-18 11:51:25 +08:00
winlin	f2dd866c78	Fix typo of Readme.	2017-04-18 11:51:19 +08:00
winlin	9a2a6ab95f	Merge SRS2	2017-04-18 11:42:11 +08:00
winlin	5e284b58a4	Fix #848, crash at HTTP fast buffer grow 2.0.239	2017-04-18 11:41:09 +08:00
winlin	bcd24126c5	Update comments for HLS	2017-04-16 21:43:30 +08:00
winlin	a98c9e04e3	Fix #547, support HLS audio in TS. 3.0.22	2017-04-16 21:33:39 +08:00
winlin	6ee85aea83	Refine mp4, extract mp4 box reader.	2017-04-16 20:46:04 +08:00
winlin	c9bed5a8bf	Refine mp4 codec for mdat.	2017-04-16 20:16:11 +08:00
winlin	18d9f6c8f1	Fix build failed.	2017-04-16 15:54:30 +08:00
winlin	1054b0a90f	Merge SRS2	2017-04-15 20:46:00 +08:00
winlin	33a0abdeff	Fix #844, support Haivision encoder. 2.0.238	2017-04-15 20:44:02 +08:00
winlin	d6e28bde69	Merge from SRS2.	2017-04-15 17:09:50 +08:00
HungMingWu	14acc59a19	Refine kernel/mp4 code (#823)	2017-04-15 17:05:05 +08:00
winlin	1c139d8fd8	Merge #846, fix fd leak for FLV stream caster. 2.0.237	2017-04-15 16:59:36 +08:00
haofz	52b6823a90	fix #826, fix memory leak in streamCasterFlv (#836)	2017-04-15 16:56:28 +08:00
winlin	8d35585c13	Merge #841, avoid the duplicated sps/pps in ts. 2.0.236	2017-04-15 16:54:42 +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	5fed19941d	Update links for compare	2017-04-12 10:39:20 +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	8b7566a007	Refine code	2017-03-26 18:30:33 +08:00
winlin	032107dbf0	Refine hls ingester	2017-03-26 17:18:34 +08:00
winlin	609605a50b	Fix #820, extract service for modules. 3.0.21	2017-03-26 17:05:50 +08:00
winlin	b75a3fad4e	For #820, fix ubuntu build failed.	2017-03-26 16:48:43 +08:00
winlin	362b5788cd	For #820, fix warnings	2017-03-26 16:45:00 +08:00
winlin	b4b5fb77f3	Add skype for English user.	2017-03-26 14:33:55 +08:00
winlin	7d1a91ca7d	Add skype for English user.	2017-03-26 14:32:46 +08:00
winlin	b83be2f29c	Add skype for English user.	2017-03-26 14:32:05 +08:00
winlin	4ccb17ddfb	Add skype for English user.	2017-03-26 14:31:44 +08:00
winlin	19632e5b4b	Add skype for English user.	2017-03-26 14:31:17 +08:00