external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Code Issues Releases Wiki Activity
2828 commits 13 branches 107 tags 375 MiB
Commit graph

2828 commits

This branch
This branch
All branches
Author SHA1 Message Date
wenjie.zhao
65f404fb42 for #340, refine ts prefix code. 2015-03-13 02:01:24 +08:00
wenjie.zhao
5969f72354 for #340, refine ts prefix code. 2015-03-13 01:32:51 +08:00
wenjie.zhao
10da182853 add hls prefix of uri supported 2015-03-13 00:22:55 +08:00
wenjie.zhao
efe3050d7a fix hls muxer Segmentation fault. 2015-03-12 23:50:21 +08:00
wenjie.zhao
73f13dfc42 fix hls muxer Segmentation fault. 2015-03-12 23:39:44 +08:00
wenjie.zhao
643f18abe4 add hds reload supported.#328 2015-03-12 22:38:11 +08:00
wenjie.zhao
abe0713980 Merge pull request #2 from winlinvip/develop 
Develop
 2015-03-12 15:11:32 +08:00
winlin
984145de72 for #328, add todo for hds, check whether disabled, support reload. 2015-03-12 11:52:35 +08:00
winlin
5d12a1ab20 for #328, add hds specification. 2015-03-12 11:36:12 +08:00
winlin
ffef62900f for #328, support adobe hds. 2.0.138. 2015-03-12 11:15:15 +08:00
winlin
da56e4fbb9 for #328, fix hds compile error on mac. 2015-03-12 07:26:30 +08:00
winlin
03bcfd9960 Merge pull request #327 from wenjiegit/develop 
for #328, add hds supported.
 2015-03-12 07:12:17 +08:00
winlin
a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable. 2015-03-11 15:54:31 +08:00
winlin
3e5821efff enable http api for x86_x64 2015-03-11 15:04:34 +08:00
winlin
3732554844 remove the xcode state. 2015-03-11 14:56:03 +08:00
winlin
1ad0c847ce fix http parse bug 2015-03-11 14:55:46 +08:00
winlin
f247ac9daf fix the http parse bug. 2015-03-11 14:48:51 +08:00
wenjie.zhao
07d8f060eb refine annotation 2015-03-11 14:36:28 +08:00
wenjie.zhao
570c0d66bd fix path issue. 2015-03-11 14:34:00 +08:00
wenjie.zhao
066158de61 Merge branch 'winlinvip-develop' into develop 2015-03-11 14:19:35 +08:00
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
wenjie.zhao
d4198ee8ba add hds supported. 2015-03-11 13:34:58 +08:00
winlin
5370493140 add ingest to mac.dev conf. 2015-03-11 13:24:14 +08:00
winlin
74d6f27519 update donation, add yefayang. 2015-03-11 11:39:43 +08:00
winlin
24616e15b5 remove the code for xcode, not required. 2015-03-10 18:33:32 +08:00
winlin
b3aed2cb59 fix the bug of configure. 2015-03-10 18:18:47 +08:00
winlin
f9767c91b5 fix configure bug, refine code for stream caster. 2015-03-10 18:07:43 +08:00
winlin
6c11207e28 fix http ts bug, the adts use id=1 which indicates the aac encoding. 2015-03-10 17:58:29 +08:00
winlin
5c3c38684b fix the bug of flv stream, metadata type should be 18 2015-03-10 17:04:02 +08:00
winlin
0ff49fd299 for #155, debug srs on xcode. 2015-03-10 13:13:31 +08:00
winlin
db7ddfd510 fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 2015-03-10 12:50:27 +08:00
winlin
20fb5f3e8e modify the colorful bash for osx. 2015-03-09 23:20:12 +08:00
winlin
b0953c1d3a add comments of audio profile supported by srs. 2015-03-08 20:02:43 +08:00
winlin
5143e3a58d fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136 2015-03-08 19:59:10 +08:00
winlin
2e9f2753c9 for #316, add stream codec info. 2.0.135 2015-03-08 18:33:35 +08:00
winlin
885b9af122 for #310, refine code to support he/hev2, use aac object. 2015-03-08 17:56:49 +08:00
winlin
8dbabe3708 fix #310, refine aac LC, support aac HE/HEv2. 2.0.134. 2015-03-08 17:36:43 +08:00
winlin
d3e2838fc6 for #310, refine the aac profile for adts and aac object for RTMP sequence header. 2015-03-08 17:33:52 +08:00
winlin
04f3f2a8f8 for #316, add codec info to stream. 2015-03-08 15:33:08 +08:00
winlin
8bf60895a9 refine the kbps of server. 2015-03-08 12:55:40 +08:00
winlin
fbbe46d272 refine the config, support directly parse file. 2015-03-07 22:25:43 +08:00
winlin
b8e70f8538 support module 2015-03-07 16:49:21 +08:00
winlin
ee30e6bb1f Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop 2015-03-07 16:39:56 +08:00
winlin
05d238f860 support modules. 2015-03-07 16:39:05 +08:00
winlin
688890cd7a refine configure, generate objs/makefile first. 2015-03-07 16:37:29 +08:00
winlin
a29b8a7a5b refine configure, move auto headers to script. 2015-03-07 16:33:06 +08:00
winlin
aaf87cf3d9 add srs module rule. 2015-03-07 16:29:18 +08:00
winlin
b360fe279d remove libaacplus. 2015-03-06 22:35:02 +08:00
winlin
496f689de7 fix bug for libfdk aac. 2015-03-06 22:29:49 +08:00
winlin
f31412db21 update readme. 2015-03-06 17:07:44 +08:00