srs/trunk/src/kernel
wenjie.zhao e57bda8908 Merge code.
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
2015-03-11 14:18:09 +08:00
..
srs_kernel_aac.cpp for #310, refine code to support he/hev2, use aac object. 2015-03-08 17:56:49 +08:00
srs_kernel_aac.hpp for #310, refine code to support he/hev2, use aac object. 2015-03-08 17:56:49 +08:00
srs_kernel_buffer.cpp for #293, move the simple buffer to kernel. 2015-01-22 18:13:33 +08:00
srs_kernel_buffer.hpp for #293, move the simple buffer to kernel. 2015-01-22 18:13:33 +08:00
srs_kernel_codec.cpp fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136 2015-03-08 19:59:10 +08:00
srs_kernel_codec.hpp for #316, add stream codec info. 2.0.135 2015-03-08 18:33:35 +08:00
srs_kernel_consts.cpp update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
srs_kernel_consts.hpp refine pithy print to more easyer to use 2.0.121. 2015-02-19 18:56:21 +08:00
srs_kernel_error.cpp update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
srs_kernel_error.hpp Merge code. 2015-03-11 14:18:09 +08:00
srs_kernel_file.cpp for #179, update the metadata of flv dvr file. 2015-02-21 19:14:05 +08:00
srs_kernel_file.hpp fix configure bug, refine code for stream caster. 2015-03-10 18:07:43 +08:00
srs_kernel_flv.cpp fix the bug of flv stream, metadata type should be 18 2015-03-10 17:04:02 +08:00
srs_kernel_flv.hpp fix the bug of flv stream, metadata type should be 18 2015-03-10 17:04:02 +08:00
srs_kernel_log.cpp update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
srs_kernel_log.hpp update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
srs_kernel_mp3.cpp for #293, support http mp3 streaming 2015-01-19 10:18:18 +08:00
srs_kernel_mp3.hpp for #293, support http mp3 streaming 2015-01-19 10:18:18 +08:00
srs_kernel_stream.cpp update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
srs_kernel_stream.hpp update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
srs_kernel_ts.cpp fix http ts bug, the adts use id=1 which indicates the aac encoding. 2015-03-10 17:58:29 +08:00
srs_kernel_ts.hpp for #304, support config default acodec/vcodec. 2.0.118. 2015-02-15 18:11:24 +08:00
srs_kernel_utility.cpp fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 2015-03-10 12:50:27 +08:00
srs_kernel_utility.hpp refine dvr, append file when dvr file exists. 2.0.122. 2015-02-19 19:50:10 +08:00