Merge branch '2.0release' into develop

8 years ago · d786d61685
parent cee9d736a4 0059b1cf7a
commit d786d61685
2 changed files with 1 additions and 1 deletions
--- a/trunk/conf/origin.conf
+++ b/trunk/conf/origin.conf
@ -6,5 +6,6 @@ listen              19350;
 max_connections     1000;
 daemon              off;
 srs_log_tank        console;
 pid                 ./objs/origin.pid;
 vhost __defaultVhost__ {
 }
--- a/trunk/src/app/srs_app_source.cpp
+++ b/trunk/src/app/srs_app_source.cpp
@ -2296,7 +2296,6 @@ int SrsSource::on_video(SrsCommonMessage* shared_video)
    if (!m) {
        return ret;
    }
    SrsAutoFree(SrsSharedPtrMessage, m);
    // consume the monotonically increase message.
    if (m->is_audio()) {