22 commits

Author	SHA1	Message	Date
panda1986	797c1b0762	support all acodec. not forced to aac.	2015-01-20 14:06:27 +08:00
panda1986	e7d54c2ca9	Update srs_app_ffmpeg.cpp ... srs develop 新增支持mp3转码后，需要添加新的acodec-libmp3lame.所以去掉srs_app_ffmpeg.cpp中对acodec的判断	2015-01-20 13:52:31 +08:00
winlin	cc22ca4890	hotfix #290, use iformat only for rtmp input. 2.0.95	2015-01-17 13:06:18 +08:00
winlin	4449a8d7b0	fix #290, use iformat only for rtmp input. 1.0.22	2015-01-17 13:04:52 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	2ed794ad52	refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224	2014-10-09 10:41:24 +08:00
winlin	bc6616bd1f	refine code according to inspect of clion. 0.9.219	2014-09-28 11:08:30 +08:00
winlin	5a95d594e7	fix #145, refine ffmpeg log, check abitrate for libaacplus. 0.9.186.	2014-08-03 13:06:37 +08:00
winlin	7b24788445	for bug #143, build on centos5.	2014-08-02 22:18:39 +08:00
winlin	f8423dfa90	fix #119: use iformat and oformat for ffmpeg transcode.	2014-07-19 15:20:16 +08:00
winlin	9bf7b722db	fix #119: use iformat and oformat for ffmpeg transcode.	2014-07-19 10:54:38 +08:00
winlin	a5f4323ea8	refine config, add comments	2014-07-18 11:46:29 +08:00
winlin	88c94193a3	rename rtmp_stack to stack. remove the global templte function to member function.	2014-07-12 08:47:47 +08:00
winlin	befde6acf7	fix mem leak for delete[] SharedPtrMessage array, explicit free elems. remove srs_freepa. 0.9.95	2014-05-13 14:24:39 +08:00
winlin	7004510cc7	fix ffmpeg log fd leak, always close log_fd. 0.9.94	2014-05-13 11:16:53 +08:00
winlin	23a1b29935	add dvr option. refine macros of auto headers	2014-04-15 14:01:57 +08:00
winlin	73c310cd2e	refine the macro.	2014-04-14 09:10:36 +08:00
winlin	eba35e2ac0	refine the macro SRS_FFMPEG to SRS_FFMPEG_STUB, SRS_FFMPEG_TOOL to build ffmpeg tool	2014-04-08 15:28:34 +08:00
winlin	e89ab84e4e	implements ingest, change to 0.9.53	2014-04-07 14:20:03 +08:00
winlin	92281548b6	add ingest config	2014-04-07 13:13:57 +08:00
winlin	4f7cfeed37	change to 0.9.52, refine encoder and ffmpeg	2014-04-07 10:15:44 +08:00
winlin	72c330d47c	refine ffmepg and encoder, extract ffmpeg.	2014-04-07 09:34:36 +08:00