external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-14 12:21:55 +00:00
Code Issues Releases Wiki Activity

fix #735 config transform refer_publish invalid. 3.0.14

Browse source
This commit is contained in:
winlin 2017-01-11 09:45:22 +08:00
parent 7bbb3bae42
commit 7fe60b5bbf
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -184,6 +184,7 @@ Please select your language:
### V3 changes
* v3.0, 2017-01-11, fix [#735][bug #735] config transform refer_publish invalid. 3.0.14
* v3.0, 2017-01-06, for [#730][bug #730] support config in/out ack size. 3.0.13
* v3.0, 2017-01-06, for [#711][bug #711] support perfile for transcode. 3.0.12
* v3.0, 2017-01-05, patch ST for valgrind and ARM. 3.0.11
@ -1367,6 +1368,7 @@ Winlin
[bug #513]: https://github.com/ossrs/srs/issues/513
[bug #730]: https://github.com/ossrs/srs/issues/730
[bug #635]: https://github.com/ossrs/srs/issues/635
[bug #735]: https://github.com/ossrs/srs/issues/735
[bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
[exo #828]: https://github.com/google/ExoPlayer/pull/828

4
trunk/src/app/srs_app_config.cpp
View file

@ -391,10 +391,10 @@ int srs_config_transform_vhost(SrsConfDirective* root)
if (n == "refer") {
SrsConfDirective* all = refer->get_or_create("all");
all->args = conf->args;
} else if (n == "play") {
} else if (n == "refer_play") {
SrsConfDirective* play = refer->get_or_create("play");
play->args = conf->args;
} else if (n == "publish") {
} else if (n == "refer_publish") {
SrsConfDirective* publish = refer->get_or_create("publish");
publish->args = conf->args;
}

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 3
#define VERSION_MINOR 0
#define VERSION_REVISION 13
#define VERSION_REVISION 14
// generated by configure, only macros.
#include <srs_auto_headers.hpp>