From 5a3b59d3c8899b2e3b3601c44c4ce320b8a1d8c5 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 8 Apr 2014 15:47:52 +0800 Subject: [PATCH] update conf file, add id for ingest. --- trunk/conf/full.conf | 4 +++- trunk/conf/ingest.conf | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index 374f89a95..72573fb77 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -93,7 +93,9 @@ vhost __defaultVhost__ { # vhost for ingest vhost ingest.srs.com { # ingest file/stream/device then push to SRS over RTMP. - ingest { + # the name/id used to identify the ingest, must be unique in this vhost. + # ingest id is used in reload or http api management. + ingest livestream { # whether enable ingest features # default: off enable on; diff --git a/trunk/conf/ingest.conf b/trunk/conf/ingest.conf index 22d5ae24d..9bee70f47 100644 --- a/trunk/conf/ingest.conf +++ b/trunk/conf/ingest.conf @@ -4,7 +4,7 @@ listen 1935; vhost __defaultVhost__ { - ingest { + ingest livestream { enable on; input { type file;