You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
wenjie.zhao
e57bda8908
Merge code.
Conflicts:
trunk/configure
trunk/src/app/srs_app_source.cpp
trunk/src/kernel/srs_kernel_error.hpp
|
10 years ago |
| .. |
|
bandwidth.conf
|
refine the max connections, compare the system ulimit max open files, error when exeed limit
|
11 years ago |
|
console.conf
|
alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux
|
10 years ago |
|
demo.19350.conf
|
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
|
10 years ago |
|
demo.conf
|
remove libaacplus.
|
10 years ago |
|
dvr.path.conf
|
fix #179: dvr support custom filepath by variables. 2.0.87
|
10 years ago |
|
dvr.segment.conf
|
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
|
10 years ago |
|
dvr.session.conf
|
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
|
10 years ago |
|
edge.conf
|
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
|
10 years ago |
|
edge.token.traverse.conf
|
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
|
10 years ago |
|
ffmpeg.transcode.conf
|
remove libaacplus.
|
10 years ago |
|
forward.master.conf
|
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
|
10 years ago |
|
forward.slave.conf
|
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
|
10 years ago |
|
full.conf
|
add comments of audio profile supported by srs.
|
10 years ago |
|
hds.conf
|
Merge code.
|
10 years ago |
|
hls.conf
|
for #136, refine the conf for hls.
|
10 years ago |
|
http.aac.live.conf
|
update readme and wiki url for http ts stream
|
10 years ago |
|
http.flv.live.conf
|
update readme and wiki url for http ts stream
|
10 years ago |
|
http.heartbeat.conf
|
refine code, add comments for ossrs.net monitor.
|
11 years ago |
|
http.hls.conf
|
alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux
|
10 years ago |
|
http.hooks.callback.conf
|
fix #138, fix http hooks bug, regression bug. 0.9.184.
|
11 years ago |
|
http.mp3.live.conf
|
update readme and wiki url for http ts stream
|
10 years ago |
|
http.server.conf
|
alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux
|
10 years ago |
|
http.ts.live.conf
|
update readme and wiki url for http ts stream
|
10 years ago |
|
ingest.conf
|
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
|
10 years ago |
|
mac.dev.conf
|
add ingest to mac.dev conf.
|
10 years ago |
|
origin.conf
|
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
|
10 years ago |
|
push.mpegts.over.udp.conf
|
for #250, add conf.
|
10 years ago |
|
push.rtsp.conf
|
update conf for rtsp
|
10 years ago |
|
ram.hls.conf
|
for #136, update the config for ram hls.
|
10 years ago |
|
realtime.conf
|
fix #211, support security allow/deny publish/play all/ip. 2.0.86
|
10 years ago |
|
rtmp.conf
|
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
|
10 years ago |
|
security.deny.publish.conf
|
fix #211, support security allow/deny publish/play all/ip. 2.0.86
|
10 years ago |
|
srs.conf
|
alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux
|
10 years ago |
|
transcode2hls.audio.only.conf
|
remove libaacplus.
|
10 years ago |