1907 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	a48ce99a31	Merge branch 'srs.master'	2014-11-08 09:21:41 +08:00
winlin	cd5c58ba5f	for bug #66, refine the api and demo.	2014-11-08 09:21:09 +08:00
winlin	1074c8d9b2	for bug #66, use new api to directly sendout h264 raw data.	2014-11-08 09:12:52 +08:00
winlin	7399c90227	Merge branch 'srs.master'	2014-11-07 23:55:22 +08:00
winlin	496f4246f4	complete the h264 to rtmp, but the sps and pps should send in a rtmp packet. for bug #66	2014-11-07 23:55:00 +08:00
winlin	6407baffd5	for bug #66, output the h264 frame type.	2014-11-07 23:19:31 +08:00
winlin	2d8c4cc7a4	Merge branch 'srs.master'	2014-11-07 23:07:56 +08:00
winlin	72ad6894ca	move the annexb decode utility to protocol.	2014-11-07 23:07:31 +08:00
winlin	a76812e725	Merge branch 'srs.master'	2014-11-07 22:36:44 +08:00
winlin	bd25626f0e	refine code for bug #66	2014-11-07 22:36:25 +08:00
winlin	9b7f28f87b	Merge branch 'srs.master'	2014-11-07 22:16:21 +08:00
winlin	955859ce82	refine librtmp, add pefix to srs_amf0_number and srs_amf0_bool	2014-11-07 22:15:56 +08:00
winlin	be36802c70	Merge branch 'srs.master'	2014-11-07 22:06:49 +08:00
winlin	1c237a821a	add api convert h264 to rtmp packet, for bug #66	2014-11-07 22:06:30 +08:00
winlin	e4af098d06	refine code for bug #66	2014-11-07 21:16:41 +08:00
winlin	7f4916f86d	Merge branch 'srs.master'	2014-11-07 21:07:23 +08:00
winlin	b964a6c534	update for bug #66, add the srs-librtmp sample for publish h.264 raw stream.	2014-11-07 21:06:44 +08:00
winlin	cf3c7f0e95	Merge branch 'srs.master'	2014-11-07 16:48:56 +08:00
winlin	1db69b153e	update the research of arm	2014-11-07 16:47:49 +08:00
winlin	1e51462677	Merge branch 'srs.master'	2014-11-06 15:54:24 +08:00
winlin	0f41e0d26f	research st: only support linux	2014-11-06 15:45:31 +08:00
winlin	d67454ecc2	research st: only support linux	2014-11-06 15:43:28 +08:00
winlin	76d5914d7c	Merge branch 'srs.master'	2014-11-06 15:18:45 +08:00
winlin	5fd308c64e	update code, warning when compile dev branch.	2014-11-06 15:18:10 +08:00
winlin	c99b5592cb	Merge branch 'srs.master'	2014-11-06 14:28:31 +08:00
winlin	fa53250202	refine the macro, use int as version type. 2.0.8	2014-11-06 14:23:08 +08:00
winlin	9d6c22d45e	Merge branch 'srs.master'	2014-11-06 14:01:28 +08:00
winlin	8521762cb3	research st: refine sync.	2014-11-06 14:00:27 +08:00
winlin	3377df0bea	research st: refine skt.	2014-11-06 13:55:06 +08:00
winlin	85b987d1a2	Merge branch 'srs.master'	2014-11-06 13:54:03 +08:00
winlin	22710db911	research st: refine sched.	2014-11-06 13:52:15 +08:00
winlin	0a60a1af58	Merge branch 'srs.master'	2014-11-06 13:41:08 +08:00
winlin	f5f8e8946f	research st: refine event, io and key.	2014-11-06 13:40:24 +08:00
winlin	28b67c10ab	Merge branch 'srs.master'	2014-11-06 13:18:23 +08:00
winlin	c38a545780	reserach st: refine key.c	2014-11-06 13:17:54 +08:00
winlin	fd0c85b324	research st: refine io.	2014-11-06 13:11:34 +08:00
winlin	a5bc8f73d1	Merge branch 'srs.master'	2014-11-06 12:51:23 +08:00
winlin	f8f18fffa7	research st: update test for st.	2014-11-06 12:50:27 +08:00
winlin	eeec9c185f	Merge branch 'srs.master'	2014-11-05 17:43:25 +08:00
winlin	0f293802c8	research st: refine the md.h	2014-11-05 17:42:57 +08:00
winlin	856ba07bd3	research st: update public and common.	2014-11-05 17:22:36 +08:00
winlin	ec7343ffab	Merge branch 'srs.master'	2014-11-05 17:16:40 +08:00
winlin	315707d726	research st: refine public	2014-11-05 17:16:15 +08:00
winlin	7bfa86de5a	Merge branch 'srs.master'	2014-11-05 17:13:18 +08:00
winlin	bba2d3dd98	research st: replace the TAB with 4spaces	2014-11-05 17:12:56 +08:00
winlin	760c37ae82	Merge branch 'srs.master'	2014-11-05 17:11:35 +08:00
winlin	55bd1dd95e	research st: replace the TAB with 4spaces	2014-11-05 17:10:54 +08:00
winlin	0faa38dc0c	research st: remove the osguess.sh	2014-11-05 17:06:18 +08:00
winlin	f3c7e354e7	Merge branch 'srs.master'	2014-11-05 17:02:27 +08:00
winlin	2dc6b7d1ea	add io for st research	2014-11-05 17:01:15 +08:00