mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Merge branch '2.0release' into develop
This commit is contained in:
commit
58b336451d
4 changed files with 48 additions and 0 deletions
22
trunk/conf/http.flv.live.edge1.conf
Normal file
22
trunk/conf/http.flv.live.edge1.conf
Normal file
|
@ -0,0 +1,22 @@
|
|||
# the config for srs to remux rtmp to flv live stream.
|
||||
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHttpStream
|
||||
# @see full.conf for detail config.
|
||||
|
||||
listen 19351;
|
||||
max_connections 1000;
|
||||
pid objs/srs.flv.19351.pid;
|
||||
srs_log_file objs/srs.flv.19351.log;
|
||||
http_server {
|
||||
enabled on;
|
||||
listen 8081;
|
||||
dir ./objs/nginx/html;
|
||||
}
|
||||
vhost __defaultVhost__ {
|
||||
mode remote;
|
||||
origin 127.0.0.1;
|
||||
http_remux {
|
||||
enabled on;
|
||||
mount [vhost]/[app]/[stream].flv;
|
||||
hstrs on;
|
||||
}
|
||||
}
|
22
trunk/conf/http.flv.live.edge2.conf
Normal file
22
trunk/conf/http.flv.live.edge2.conf
Normal file
|
@ -0,0 +1,22 @@
|
|||
# the config for srs to remux rtmp to flv live stream.
|
||||
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHttpStream
|
||||
# @see full.conf for detail config.
|
||||
|
||||
listen 19352;
|
||||
max_connections 1000;
|
||||
pid objs/srs.flv.19352.pid;
|
||||
srs_log_file objs/srs.flv.19352.log;
|
||||
http_server {
|
||||
enabled on;
|
||||
listen 8082;
|
||||
dir ./objs/nginx/html;
|
||||
}
|
||||
vhost __defaultVhost__ {
|
||||
mode remote;
|
||||
origin 127.0.0.1;
|
||||
http_remux {
|
||||
enabled on;
|
||||
mount [vhost]/[app]/[stream].flv;
|
||||
hstrs on;
|
||||
}
|
||||
}
|
|
@ -25,6 +25,7 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
#include <sstream>
|
||||
#include <algorithm>
|
||||
using namespace std;
|
||||
|
||||
#include <srs_kernel_error.hpp>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue