2134 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	a5d9d81150	Merge branch 'srs.master'	2014-11-08 18:44:15 +08:00
winlin	a827766cd6	for #191, support exported to project or file.	2014-11-08 18:43:58 +08:00
winlin	0e089e52ca	Merge branch 'srs.master'	2014-11-08 18:41:50 +08:00
winlin	606fc13a03	rename the confict macro to srs_lib_trace	2014-11-08 18:37:15 +08:00
winlin	3405f35d06	fix #191: configure --export-librtmp-project and --export-librtmp-single. 2.0.11.	2014-11-08 18:33:15 +08:00
winlin	323d7cf6a9	Merge branch 'srs.master'	2014-11-08 17:00:00 +08:00
winlin	e62c3a4e0e	for bug #66, clear the sps and pps.	2014-11-08 16:59:42 +08:00
winlin	ba418bdb5e	Merge branch 'srs.master'	2014-11-08 16:46:07 +08:00
winlin	926650840e	fix #191, configure --export-librtmp. 2.0.10.	2014-11-08 16:45:50 +08:00
winlin	c4dacdb7f6	Merge branch 'srs.master'	2014-11-08 16:07:58 +08:00
winlin	eb88ebfb39	use relative objs dir for makefile. for bug #191	2014-11-08 16:07:31 +08:00
winlin	d4d3d46317	implements export srslibrtmp. for bug #191	2014-11-08 15:31:21 +08:00
winlin	14e6caeeb8	Merge branch 'srs.master'	2014-11-08 14:06:54 +08:00
winlin	5554922820	refine librtmp tools, use srs_trace macro instead printf.	2014-11-08 14:06:40 +08:00
winlin	f492175a6d	Merge branch 'srs.master'	2014-11-08 14:01:14 +08:00
winlin	cf5c24af4a	refine librtmp, unify all tools format and usage.	2014-11-08 14:00:59 +08:00
winlin	aac6de69b4	Merge branch 'srs.master'	2014-11-08 13:42:05 +08:00
winlin	6de83db76e	refine srs-librtmp log macro	2014-11-08 13:41:47 +08:00
winlin	65ecfb0f06	Merge branch 'srs.master'	2014-11-08 13:35:55 +08:00
winlin	f92303c764	refine all research tools, remove the public header, add log to srs_librtmp.h	2014-11-08 13:35:38 +08:00
winlin	7ba07c6f49	refine librtmp, add example to api.	2014-11-08 13:16:56 +08:00
winlin	f6f884bf02	Merge branch 'srs.master'	2014-11-08 12:37:27 +08:00
winlin	106bef802f	fix #66, srs-librtmp support write h264 raw packet. 2.0.9.	2014-11-08 12:36:00 +08:00
winlin	780c85d608	Merge branch 'srs.master'	2014-11-08 10:44:19 +08:00
winlin	3358570be6	refine for bug#66, implements the usage.	2014-11-08 10:44:00 +08:00
winlin	8985147e6b	Merge branch 'srs.master'	2014-11-08 10:29:19 +08:00
winlin	0075779d38	for bug #66, refine the api to send h264 frames.	2014-11-08 10:28:59 +08:00
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